fix: docker

Etimo · Nov 14, 2024 · 81b47bd · 81b47bd
1 parent 2c0e983
commit 81b47bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -54,11 +54,11 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      #- name: Build base image
-      #  run: docker build -t diamonds2_base:latest -f .docker/dockerfiles/base .
+      - name: Build base image
+        run: docker build -t diamonds2_base:latest -f .docker/dockerfiles/base .
 
       - name: Build docker image
-        run: docker compose -f docker-compose.yml build
+        run: docker compose -f docker-compose.yml --build
 
   # Build and push production images
   build-prod:
@@ -74,11 +74,11 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      #- name: Build base image
-      #  run: docker build -t diamonds2_base:latest -f .docker/dockerfiles/base .
+      - name: Build base image
+        run: docker build -t diamonds2_base:latest -f .docker/dockerfiles/base .
 
       - name: Build docker image
-        run: docker compose -f docker-compose.prod-build.yml build
+        run: docker compose -f docker-compose.prod-build.yml --build
 
       - name: Extract branch name
         shell: bash

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,12 +4,6 @@ networks:
   diamonds2:
 
 services:
-  base:
-    image: diamonds2_base:latest
-    build:
-      context: .
-      dockerfile: .docker/dockerfiles/base
-
   frontend:
     build:
       context: .