Fix DOCKERFILE_PATH

mjanez · Feb 8, 2024 · 50620a7 · 50620a7
1 parent c5b2200
commit 50620a7
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/docker-manual.yaml b/.github/workflows/docker-manual.yaml
@@ -7,7 +7,7 @@ env:
   IMAGE_NAME: ${{ github.repository }}
   CONTEXT: .
   BRANCH: ${{ github.ref_name }}
-  DOCKERFILE_PATH: .
+  DOCKERFILE_PATH: /ckan-mqa
   DOCKERFILE: Dockerfile
 
 jobs:

diff --git a/.github/workflows/docker-pr.yaml b/.github/workflows/docker-pr.yaml
@@ -1,4 +1,4 @@
-name: Test ckan-pycsw images (PR)
+name: Test ckan-mqa images (PR)
 
 on:
   pull_request:
@@ -11,7 +11,7 @@ env:
     IMAGE_NAME: ${{ github.repository }}
     CONTEXT: .
     BRANCH: ${{ github.head_ref }}
-    DOCKERFILE_PATH: .
+    DOCKERFILE_PATH: /ckan-mqa
     DOCKERFILE: Dockerfile
     HADOLINT_VERSION: 2.12.0
 

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -13,7 +13,7 @@ env:
   IMAGE_NAME: ${{ github.repository }}
   CONTEXT: .
   BRANCH: ${{ github.head_ref }}
-  DOCKERFILE_PATH: .
+  DOCKERFILE_PATH: /ckan-mqa
   DOCKERFILE: Dockerfile
 
 jobs:

diff --git a/Dockerfile → ckan-mqa/Dockerfile b/Dockerfile → ckan-mqa/Dockerfile
@@ -21,7 +21,7 @@ COPY pyproject.toml pdm.lock .
 
 RUN pdm install --no-self --group prod
 
-COPY ckan-mqa/entrypoint.sh entrypoint.sh
+COPY ckan-mqa/docker-entrypoint.d/entrypoint.sh entrypoint.sh
 COPY ckan2mqa ckan2mqa
 
 ENTRYPOINT ["/bin/bash", "./entrypoint.sh"]
diff --git a/Dockerfile.dev → ckan-mqa/Dockerfile.dev b/Dockerfile.dev → ckan-mqa/Dockerfile.dev
@@ -21,11 +21,11 @@ COPY pyproject.toml pdm.lock .
 
 RUN pdm install --no-self --group prod
 
-COPY ckan-mqa/entrypoint_dev.sh entrypoint.sh
+COPY ckan-mqa/docker-entrypoint.d/entrypoint_dev.sh entrypoint.sh
 COPY ckan2mqa ckan2mqa
 
 EXPOSE 5678/TCP
 
 # Set entrypoint with debugpy
-ENTRYPOINT ["python3", "-m", "debugpy", "--listen", "0.0.0.0:5678", "--wait-for-client", "./entrypoint_dev.sh"]
+ENTRYPOINT ["python3", "-m", "debugpy", "--listen", "0.0.0.0:5678", "--wait-for-client", "./ckan-mqa/docker-entrypoint.d/entrypoint_dev.sh"]
 CMD ["tail", "-f", "/dev/null"]
diff --git a/ckan-mqa/entrypoint.sh → ckan-mqa/docker-entrypoint.d/entrypoint.sh b/ckan-mqa/entrypoint.sh → ckan-mqa/docker-entrypoint.d/entrypoint.sh
diff --git a/ckan-mqa/entrypoint_dev.sh → ...mqa/docker-entrypoint.d/entrypoint_dev.sh b/ckan-mqa/entrypoint_dev.sh → ...mqa/docker-entrypoint.d/entrypoint_dev.sh
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -4,7 +4,7 @@ services:
     container_name: ckan-mqa-dev
     build:
       context: .
-      dockerfile: Dockerfile.dev
+      dockerfile: ckan-mqa/Dockerfile.dev
     env_file:
       - .env
     logging:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     container_name: ckan-mqa
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: ckan-mqa/Dockerfile
     image: ghcr.io/mjanez/ckan-mqa:latest
     env_file:
       - .env