Merge branch 'develop' into 'mouse.over.image'

# Conflicts:
#   config.toml

.gitlab-ci.yml

@@ -5,21 +5,36 @@ before_script:
   - module load singularity/3.0.2
   - module load awscli
 
+stages:
+  - build_stage
+  - deploy_stage
+
 build:
+  stage: build_stage
   script:
   - singularity run 'docker://monachus/hugo' hugo
   artifacts:
     paths:
-    - public
+    - public/
+    expire_in: 1 week
+  cache:
+    paths:
+    - public/
+
+deploy.dev:
+  stage: deploy_stage
+  script:
+  - singularity run 'docker://monachus/hugo' hugo deploy aws-dev --maxDeletes -1
+  dependencies:
+  - build
   only:
   - develop
-deploy:
+
+deploy.live:
+  stage: deploy_stage
   script:
-  - singularity run 'docker://monachus/hugo' hugo
-##  - singularity run 'docker://monachus/hugo' hugo deploy aws --maxDeletes -1
-##  - aws s3 ls s3://www.strandlab.net/ --recursive | awk '{cmd="aws s3api put-object-acl --acl bucket-owner-full-control --bucket www.strandlab.net --key "$4; system(cmd)}'
-  artifacts:
-    paths:
-    - public
+  - singularity run 'docker://monachus/hugo' hugo deploy aws --maxDeletes -1
+  dependencies:
+  - build
   only:
   - master
\ No newline at end of file

config.toml

@@ -82,4 +82,7 @@ paginate = 10
 
   [[deployment.targets]]
     name = "aws"
+    URL = "s3://strandlab?region=us-east-2"
+  [[deployment.targets]]
+    name = "aws-dev"
     URL = "s3://strandlab.dev?region=us-east-2"
\ No newline at end of file