[TM-1312] Clean up user service image build.

.github/workflows/deploy.yml

@@ -47,9 +47,12 @@ jobs:
       - name: Build, tag, and push images to Amazon ECR
         id: build-images
         run: |
+          : # Don't build the base image with NODE_ENV because it'll limit the packages that are installed
           docker build -t terramatch-microservices-base:nx-base .
-          docker build --build-arg NODE_ENV=${{ env.NODE_ENV }} -f apps/user-service/Dockerfile -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
-          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
-          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
-          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+          : # Each service we add will get a separate build line here
+          USER_SERVICE_IMAGE = $ECR_REGISTRY/$ECR_REPOSITORY:user-service$IMAGE_TAG
+          docker build --build-arg NODE_ENV=${{ env.NODE_ENV }} -f apps/user-service/Dockerfile -t $USER_SERVICE_IMAGE .
+          docker push $USER_SERVICE_IMAGE
+          echo "image=$USER_SERVICE_IMAGE" >> $GITHUB_OUTPUT
+          echo "image=$USER_SERVICE_IMAGE"
 

docker-compose.yml

@@ -1,26 +1,15 @@
-version: "3.8"
-
-networks:
-  corp:
-    driver: bridge
-
+version: "3"
 services:
-  user-service:
-    container_name: user-service
+  mariadb:
     build:
-      context: ./
-      cache_from:
-        - terramatch-microservices-base:nx-base
-      dockerfile: ./apps/user-service/Dockerfile
-      args:
-        NODE_ENV: "production"
-        BUILD_FLAG: ""
-    image: user-service:nx-prod
+      context: "."
+      dockerfile: "docker/mariadb.Dockerfile"
     ports:
-      - 4010:4010
-    environment:
-      NODE_ENV: "production"
-      PORT: 4010
+      - "3360:3306"
     networks:
-      - corp
-    restart: on-failure
+      - "default"
+    environment:
+      MYSQL_ROOT_PASSWORD: "root"
+      MYSQL_DATABASE: "terramatch_microservices_test"
+      MYSQL_USER: "wri"
+      MYSQL_PASSWORD: "wri"