Merge branch 'swarm-deployment'

c3sr · Nov 16, 2021 · bdbfe41 · bdbfe41
2 parents 527dc9a + 161d95c
commit bdbfe41
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 59 deletions.
diff --git a/.env b/.env
@@ -1 +1,3 @@
-DOCKER_REGISTRY=staging-ec2.mlmodelscope.org:5000
+DOCKER_REGISTRY=c3sr
+API_VERSION=latest
+UPLOADER_VERSION=latest
diff --git a/README.md b/README.md
@@ -6,10 +6,9 @@ This repository provides the main parts of the mlmodelscope API
 
 The `DOCKER_REGISTRY` environment variable must be set to build or pull
 the correct image tags for development, staging, or production. The `.env`
-file sets this to `staging-ec2.mlmodelscope.org:5000` by default, which
-is the staging registry. This is safe to use for development as well. For
-production it should be set to `c3sr` so that images will be tagged and
-pulled from the C3SR namespace on Docker Hub.
+file sets this to `c3sr` by default so that images will be tagged and
+pulled from the C3SR namespace on Docker Hub. Change this if you want to
+use a private registry to host your own modified images.
 
 ## API
 

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -1,4 +1,4 @@
-version: "3.9"
+version: "3.8"
 services:
   api:
     build:

diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
@@ -0,0 +1,49 @@
+version: "3.8"
+services:
+  api:
+    networks:
+      - default
+      - traefik
+
+    deploy:
+      labels:
+        - "traefik.enable=true"
+        - "traefik.docker.network=traefik"
+        - "traefik.http.routers.mlmodelscope-api.rule=Host(`${ENVIRONMENT}api.mlmodelscope.org`)"
+        - "traefik.http.routers.mlmodelscope-api.entrypoints=websecure"
+        - "traefik.http.routers.mlmodelscope-api.tls.certresolver=letsencrypt"
+        - "traefik.http.services.mlmodelscope-api.loadbalancer.server.port=80"
+        - "traefik.http.middlewares.add-cors.headers.accessControlAllowMethods=GET,OPTIONS,PUT"
+        - "traefik.http.middlewares.add-cors.headers.accesscontrolalloworiginlist=https://staging.mlmodelscope.org,http://localhost:3000"
+        - "traefik.http.middlewares.add-cors.headers.accessControlAllowCredentials=true"
+        - "traefik.http.middlewares.add-cors.headers.accessControlAllowHeaders=origin,x-requested-with,content-type,accept,x-request-id"
+        - "traefik.http.middlewares.add-cors.headers.accesscontrolmaxage=100"
+        - "traefik.http.middlewares.add-cors.headers.addvaryheader=true"
+        - "traefik.http.routers.mlmodelscope-api.middlewares=add-cors"
+
+  uploader:
+    networks:
+      - default
+      - traefik
+
+    deploy:
+      labels:
+        - "traefik.enable=true"
+        - "traefik.docker.network=traefik"
+        - "traefik.http.routers.mlmodelscope-uploader.rule=Host(`${ENVIRONMENT}uploader.mlmodelscope.org`)"
+        - "traefik.http.routers.mlmodelscope-uploader.entrypoints=websecure"
+        - "traefik.http.routers.mlmodelscope-uploader.tls.certresolver=letsencrypt"
+        - "traefik.http.services.mlmodelscope-uploader.loadbalancer.server.port=80"
+        - "traefik.http.middlewares.add-cors-uploader.headers.accessControlAllowMethods=GET,OPTIONS,PUT,PATCH"
+        - "traefik.http.middlewares.add-cors-uploader.headers.accesscontrolalloworiginlist=https://staging.mlmodelscope.org"
+        - "traefik.http.middlewares.add-cors-uploader.headers.accessControlAllowCredentials=true"
+        - "traefik.http.middlewares.add-cors-uploader.headers.accessControlAllowHeaders=origin,x-requested-with,content-type,accept,x-request-id,tus-resumable,upload-length,upload-metadata,upload-offset"
+        - "traefik.http.middlewares.add-cors-uploader.headers.accesscontrolmaxage=100"
+        - "traefik.http.middlewares.add-cors-uploader.headers.addvaryheader=true"
+        - "traefik.http.routers.mlmodelscope-uploader.middlewares=add-cors-uploader"
+
+
+networks:
+  traefik:
+    external:
+      name: traefik
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,27 +1,7 @@
-version: "3.9"
+version: "3.8"
 services:
   api:
-    image: "$DOCKER_REGISTRY/mlmodelscope-api:1.0"
-
-    networks:
-      - default
-      - traefik
-
-    deploy:
-      labels:
-        - "traefik.enable=true"
-        - "traefik.docker.network=traefik"
-        - "traefik.http.routers.mlmodelscope-api.rule=Host(`staging.api.mlmodelscope.org`)"
-        - "traefik.http.routers.mlmodelscope-api.entrypoints=websecure"
-        - "traefik.http.routers.mlmodelscope-api.tls.certresolver=letsencrypt"
-        - "traefik.http.services.mlmodelscope-api.loadbalancer.server.port=80"
-        - "traefik.http.middlewares.add-cors.headers.accessControlAllowMethods=GET,OPTIONS,PUT"
-        - "traefik.http.middlewares.add-cors.headers.accesscontrolalloworiginlist=https://staging.mlmodelscope.org,http://localhost:3000"
-        - "traefik.http.middlewares.add-cors.headers.accessControlAllowCredentials=true"
-        - "traefik.http.middlewares.add-cors.headers.accessControlAllowHeaders=origin,x-requested-with,content-type,accept,x-request-id"
-        - "traefik.http.middlewares.add-cors.headers.accesscontrolmaxage=100"
-        - "traefik.http.middlewares.add-cors.headers.addvaryheader=true"
-        - "traefik.http.routers.mlmodelscope-api.middlewares=add-cors"
+    image: "$DOCKER_REGISTRY/mlmodelscope-api:$API_VERSION"
 
     environment:
       - C3SR_REGISTRY_ENDPOINTS=registry:8500
@@ -53,31 +33,6 @@ services:
       - "9411:9411"
 
   uploader:
-    image: "$DOCKER_REGISTRY/mlmodelscope-uploader:1.0"
-    networks:
-      - default
-      - traefik
-
-    deploy:
-      labels:
-        - "traefik.enable=true"
-        - "traefik.docker.network=traefik"
-        - "traefik.http.routers.mlmodelscope-uploader.rule=Host(`staging.uploader.mlmodelscope.org`)"
-        - "traefik.http.routers.mlmodelscope-uploader.entrypoints=websecure"
-        - "traefik.http.routers.mlmodelscope-uploader.tls.certresolver=letsencrypt"
-        - "traefik.http.services.mlmodelscope-uploader.loadbalancer.server.port=80"
-        - "traefik.http.middlewares.add-cors-uploader.headers.accessControlAllowMethods=GET,OPTIONS,PUT,PATCH"
-        - "traefik.http.middlewares.add-cors-uploader.headers.accesscontrolalloworiginlist=https://staging.mlmodelscope.org"
-        - "traefik.http.middlewares.add-cors-uploader.headers.accessControlAllowCredentials=true"
-        - "traefik.http.middlewares.add-cors-uploader.headers.accessControlAllowHeaders=origin,x-requested-with,content-type,accept,x-request-id,tus-resumable,upload-length,upload-metadata,upload-offset"
-        - "traefik.http.middlewares.add-cors-uploader.headers.accesscontrolmaxage=100"
-        - "traefik.http.middlewares.add-cors-uploader.headers.addvaryheader=true"
-        - "traefik.http.routers.mlmodelscope-uploader.middlewares=add-cors-uploader"
-
+    image: "$DOCKER_REGISTRY/mlmodelscope-uploader:$UPLOADER_VERSION"
     ports:
       - "8089:80"
-
-networks:
-  traefik:
-    external:
-      name: traefik
diff --git a/scripts/build-container.sh b/scripts/build-container.sh
@@ -3,16 +3,23 @@
 cd `git rev-parse --show-toplevel`
 source "scripts/functions.sh"
 
-USAGE="Usage: ${0} <target>
+USAGE="Usage: ${0} <target> <version> (registry)
 
-    target        The service to build into a container, i.e. 'uploader':
-                      > build.sh uploader"
+    target        (required) The service to build into a container, i.e. 'uploader':
+
+    version       (required) The version number to tag the image with
+                      Note: image will always be tagged as 'latest'
+
+    registry      (optional) The Docker registry to tag images against
+                      Defaults to 'mlmodelscope-api'"
 
 TARGET="$1"
 TARGET_DIR="./$TARGET"
+VERSION="$2"
+REGISTRY="$3"
+: ${REGISTRY:="mlmodelscope-api"}
 DOCKERFILE="./docker/Dockerfile.$1"
 
-
 if [ -z $TARGET ]; then
     die_with_message "$USAGE"
 fi
@@ -21,10 +28,15 @@ if [ ! -d "$TARGET" ]; then
     die_with_message "Target ${TARGET} does not exist"
 fi
 
+if [ -z $VERSION ]; then
+    die_with_message "$USAGE"
+fi
+
 if [ ! -f "$DOCKERFILE" ]; then
     die_with_message "Dockerfile ${DOCKERFILE} does not exist"
 fi
 
-docker build -t "mlmodelscope-api/$1:latest" --file "$DOCKERFILE" "$TARGET"
+docker build -t "$REGISTRY/mlmodelscope-$TARGET:$VERSION" --file "$DOCKERFILE" "$TARGET_DIR"
+docker tag "$REGISTRY/mlmodelscope-$TARGET:$VERSION" "$REGISTRY/mlmodelscope-$TARGET:latest"
 
 cleanup_and_exit