Merge pull request #318 from hubmapconsortium/yuanzhou/new-docker-bas…

…e-and-stage-delete

Version bump, new docker base, stage delete

VERSION

@@ -1 +1 @@
-2.1.34
+2.2.0

docker-compose.deployment.prod.yml

@@ -1,5 +1,3 @@
-version: "3.7"
-
 services:
 
   hubmap-auth:

docker-compose.deployment.test.yml

@@ -1,5 +1,3 @@
-version: "3.7"
-
 services:
 
   hubmap-auth:

docker-compose.development.yml

@@ -1,5 +1,3 @@
-version: "3.7"
-
 services:
 
   hubmap-auth:

docker-compose.yml

@@ -1,6 +1,3 @@
-version: "3.7"
-
-# Will use the hostname when talking between services on the same network
 services:
 
   hubmap-auth:

docker-deployment.sh

@@ -42,8 +42,8 @@ function get_dir_of_this_script () {
 }
 
 
-if [[ "$1" != "test" && "$1" != "stage" && "$1" != "prod" ]]; then
-    echo "Unknown deployment environment '$1', specify one of the following: test|stage|prod"
+if [[ "$1" != "test" && "$1" != "prod" ]]; then
+    echo "Unknown deployment environment '$1', specify one of the following: test|prod"
 else
     if [[ "$2" != "start" && "$2" != "stop" && "$2" != "down" ]]; then
         echo "Unknown command '$2', specify one of the following: start|stop|down"
@@ -61,11 +61,11 @@ else
         echo
 
         if [ "$2" = "start" ]; then
-            docker-compose -f docker-compose.yml -f docker-compose.deployment.$1.yml -p gateway up -d
+            docker compose -f docker-compose.yml -f docker-compose.deployment.$1.yml -p gateway up -d
         elif [ "$2" = "stop" ]; then
-            docker-compose -f docker-compose.yml -f docker-compose.deployment.$1.yml -p gateway stop
+            docker compose -f docker-compose.yml -f docker-compose.deployment.$1.yml -p gateway stop
         elif [ "$2" = "down" ]; then
-            docker-compose -f docker-compose.yml -f docker-compose.deployment.$1.yml -p gateway down
+            docker compose -f docker-compose.yml -f docker-compose.deployment.$1.yml -p gateway down
         fi
     fi
 fi

docker-development.sh

@@ -72,7 +72,7 @@ else
 
         echo 'Checks complete, all good :)'
     elif [ "$1" = "config" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p gateway config
+        docker compose -f docker-compose.yml -f docker-compose.development.yml -p gateway config
     elif [ "$1" = "build" ]; then
         # Delete old VERSION and BUILD files if found
         if [ -f "hubmap-auth/VERSION" ]; then
@@ -87,13 +87,13 @@ else
         cp ./VERSION hubmap-auth
         cp ./BUILD hubmap-auth
 
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p gateway build
+        docker compose -f docker-compose.yml -f docker-compose.development.yml -p gateway build
     elif [ "$1" = "start" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p gateway up -d
+        docker compose -f docker-compose.yml -f docker-compose.development.yml -p gateway up -d
     elif [ "$1" = "stop" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p gateway stop
+        docker compose -f docker-compose.yml -f docker-compose.development.yml -p gateway stop
     elif [ "$1" = "down" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p gateway down
+        docker compose -f docker-compose.yml -f docker-compose.development.yml -p gateway down
     fi
 fi
 

hubmap-auth/Dockerfile

@@ -1,5 +1,5 @@
 # Parent image
-FROM hubmap/api-base-image:1.0.0
+FROM hubmap/api-base-image:1.1.0
 
 LABEL description="HuBMAP Authentication and Authorization Service"
 

hubmap-auth/entrypoint.sh

@@ -34,7 +34,7 @@ if [ $DEPLOY_MODE != "localhost"  ]; then
     chown -R hubmap:hubmap /etc/letsencrypt
 fi
 
-# Lastly we use gosu to execute our process "$@" as that user
+# Lastly we use su-exec to execute our process "$@" as that user
 # Remember CMD from a Dockerfile of child image gets passed to the entrypoint.sh as command line arguments
 # "$@" is a shell variable that means "all the arguments"
-exec /usr/local/bin/gosu hubmap "$@"
+exec /usr/local/bin/su-exec hubmap "$@"

nginx/conf.d-stage/prod-portal-ui.conf → nginx/conf.d-test/prod-portal-ui.conf

@@ -3,7 +3,7 @@ server {
     # Only root can listen on ports below 1024, we use higher-numbered ports
     # since nginx is running under non-root user hubmap
     listen 8080;
-    server_name portal-prod.stage.hubmapconsortium.org;
+    server_name portal-prod.test.hubmapconsortium.org;
 
     location / {
         return 301 https://$host$request_uri;
@@ -15,11 +15,11 @@ server {
     # Only root can listen on ports below 1024, we use higher-numbered ports
     # since nginx is running under non-root user hubmap
     listen 4430 ssl; # managed by Certbot
-    server_name portal-prod.stage.hubmapconsortium.org;
+    server_name portal-prod.test.hubmapconsortium.org;
     root /usr/share/nginx/html;
 
-    ssl_certificate /etc/letsencrypt/live/gateway.stage.hubmapconsortium.org/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/gateway.stage.hubmapconsortium.org/privkey.pem; # managed by Certbot
+    ssl_certificate /etc/letsencrypt/live/gateway.test.hubmapconsortium.org/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/gateway.test.hubmapconsortium.org/privkey.pem; # managed by Certbot
     include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot