Fix deploy pipelines

.gitlab-ci.yml

@@ -16,7 +16,7 @@ client_build:
     - docker
     - git
   script:
-    - docker build -t webapp-client --build-arg ASSET_PATH=/lab/ --build-arg CLIENT_ID=615417781b5701158c4997ba --build-arg CLIENT_SECRET=l7FNrUMa3ILzi3qiyo5J44wVGC40YTBx --target build -f ./docker/Dockerfile.client .
+    - docker build -t webapp-client --build-arg CLIENT_ID=615417781b5701158c4997ba --build-arg CLIENT_SECRET=l7FNrUMa3ILzi3qiyo5J44wVGC40YTBx --target build -f ./docker/Dockerfile.client .
     - mkdir image
     - docker save webapp-client | gzip > image/client.tar.gz
   artifacts:
@@ -71,8 +71,8 @@ latest_deploy:
   script:
     - docker load -i image/service.tar.gz
     - docker load -i image/client.tar.gz
-    - COMPOSE_DOCKER_CLI_BUILD=1 docker-compose build --build-arg ASSET_PATH=/lab/ --build-arg CLIENT_ID=615417781b5701158c4997ba --build-arg CLIENT_SECRET=l7FNrUMa3ILzi3qiyo5J44wVGC40YTBx
-    - echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USER --password-stdin ftlab.utu.fi
+    - COMPOSE_DOCKER_CLI_BUILD=1 docker-compose build --build-arg CLIENT_ID=615417781b5701158c4997ba --build-arg CLIENT_SECRET=l7FNrUMa3ILzi3qiyo5J44wVGC40YTBx
+    - echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USER --password-stdin app.ftlab.utu.fi
     - docker-compose push
 
 tag_deploy:
@@ -89,6 +89,6 @@ tag_deploy:
   script:
     - docker load -i image/service.tar.gz
     - docker load -i image/client.tar.gz
-    - TAG="$CI_COMMIT_TAG" COMPOSE_DOCKER_CLI_BUILD=1 docker-compose build --build-arg ASSET_PATH=/lab/ --build-arg CLIENT_ID=615417781b5701158c4997ba --build-arg CLIENT_SECRET=l7FNrUMa3ILzi3qiyo5J44wVGC40YTBx
-    - echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USER --password-stdin ftlab.utu.fi
+    - TAG="$CI_COMMIT_TAG" COMPOSE_DOCKER_CLI_BUILD=1 docker-compose build --build-arg CLIENT_ID=615417781b5701158c4997ba --build-arg CLIENT_SECRET=l7FNrUMa3ILzi3qiyo5J44wVGC40YTBx
+    - echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USER --password-stdin app.ftlab.utu.fi
     - docker-compose push

docker-compose.yml

 version: "3.4"
 services:
   client:
-    image: ftlab.utu.fi/app-client:${TAG:-latest}
+    image: app.ftlab.utu.fi/app-client:${TAG:-latest}
     build:
       context: ./
       dockerfile: ./docker/Dockerfile.client
@@ -24,7 +24,7 @@ services:
     volumes:
       - ./packages/client/dist:/usr/share/nginx/html
   socketservice:
-    image: ftlab.utu.fi/app-socketservice:${TAG:-latest}
+    image: app.ftlab.utu.fi/app-socketservice:${TAG:-latest}
     build:
       context: ./
       dockerfile: ./docker/Dockerfile.services
@@ -38,7 +38,7 @@ services:
     volumes:
       - ./:/usr/src/app
   authservice:
-    image: ftlab.utu.fi/app-authservice:${TAG:-latest}
+    image: app.ftlab.utu.fi/app-authservice:${TAG:-latest}
     build:
       context: ./
       dockerfile: ./docker/Dockerfile.services
@@ -53,7 +53,7 @@ services:
     volumes:
       - ./:/usr/src/app
   nodeservice:
-    image: ftlab.utu.fi/app-nodeservice:${TAG:-latest}
+    image: app.ftlab.utu.fi/app-nodeservice:${TAG:-latest}
     build:
       context: ./
       dockerfile: ./docker/Dockerfile.services
@@ -68,7 +68,7 @@ services:
     volumes:
       - ./:/usr/src/app
   configservice:
-    image: ftlab.utu.fi/app-configservice:${TAG:-latest}
+    image: app.ftlab.utu.fi/app-configservice:${TAG:-latest}
     build:
       context: ./
       dockerfile: ./docker/Dockerfile.services
@@ -83,7 +83,7 @@ services:
     volumes:
       - ./:/usr/src/app
   recorderservice:
-    image: ftlab.utu.fi/app-recorderservice:${TAG:-latest}
+    image: app.ftlab.utu.fi/app-recorderservice:${TAG:-latest}
     build:
       context: ./
       dockerfile: ./docker/Dockerfile.services
@@ -98,7 +98,7 @@ services:
       - ./:/usr/src/app
       - "$HOME/ftl-data:/data/ftl"
   streamservice:
-    image: ftlab.utu.fi/app-streamservice:${TAG:-latest}
+    image: app.ftlab.utu.fi/app-streamservice:${TAG:-latest}
     build:
       context: ./
       dockerfile: ./docker/Dockerfile.services