Fix paths/contexts

mjanez · Sep 7, 2023 · 9e87674 · 9e87674
1 parent 5d6d620
commit 9e87674
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/docker-dev.yaml b/.github/workflows/docker-dev.yaml
@@ -49,5 +49,5 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          context: ./ckan-ogc
+          context: .
           file: ./ckan-ogc/Dockerfile.dev
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -49,5 +49,5 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          context: ./ckan-ogc
+          context: .
           file: ./ckan-ogc/Dockerfile
diff --git a/ckan-ogc/Dockerfile b/ckan-ogc/Dockerfile
@@ -25,8 +25,8 @@ COPY pyproject.toml pdm.lock .
 
 RUN pdm install --no-self --group prod
 
-COPY conf/config.yaml.template config.yaml
-COPY docker-entrypoint.d/entrypoint.sh entrypoint.sh
+COPY ckan-ogc/conf/config.yaml.template config.yaml
+COPY ckan-ogc/docker-entrypoint.d/entrypoint.sh entrypoint.sh
 COPY ogc2ckan ogc2ckan
 COPY data data
 

diff --git a/ckan-ogc/Dockerfile.dev b/ckan-ogc/Dockerfile.dev
@@ -25,8 +25,8 @@ COPY pyproject.toml pdm.lock .
 
 RUN pdm install --no-self --group prod
 
-COPY conf/config.yaml.template config.yaml
-COPY docker-entrypoint.d/entrypoint_dev.sh entrypoint.sh
+COPY ckan-ogc/conf/config.yaml.template config.yaml
+COPY ckan-ogc/docker-entrypoint.d/entrypoint_dev.sh entrypoint.sh
 COPY ogc2ckan ogc2ckan
 COPY data data
 

diff --git a/ckan-ogc/Dockerfile.ghcr b/ckan-ogc/Dockerfile.ghcr
@@ -18,8 +18,8 @@ COPY pyproject.toml pdm.lock .
 
 RUN pdm install --no-self --group prod
 
-COPY conf/config.yaml.template config.yaml
-COPY docker-entrypoint.d/entrypoint.sh entrypoint.sh
+COPY ckan-ogc/conf/config.yaml.template config.yaml
+COPY ckan-ogc/docker-entrypoint.d/entrypoint.sh entrypoint.sh
 COPY ogc2ckan ogc2ckan
 COPY data data
 

diff --git a/ckan-ogc/Dockerfile.ghcr.dev b/ckan-ogc/Dockerfile.ghcr.dev
@@ -18,8 +18,8 @@ COPY pyproject.toml pdm.lock .
 
 RUN pdm install --no-self --group prod
 
-COPY conf/config.yaml.template config.yaml
-COPY docker-entrypoint.d/entrypoint_dev.sh entrypoint.sh
+COPY ckan-ogc/conf/config.yaml.template config.yaml
+COPY ckan-ogc/docker-entrypoint.d/entrypoint_dev.sh entrypoint.sh
 COPY ogc2ckan ogc2ckan
 COPY data data
 

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -4,8 +4,8 @@ services:
   ogc2ckan:
     container_name: ckan-ogc-dev
     build:
-      context: ckan-ogc/
-      dockerfile: Dockerfile.dev
+      context: .
+      dockerfile: ckan-ogc/Dockerfile.dev
     env_file:
       - .env
     logging:

diff --git a/docker-compose.ghcr.dev.yml b/docker-compose.ghcr.dev.yml
@@ -4,8 +4,8 @@ services:
   ogc2ckan:
     container_name: ckan-ogc-dev
     build:
-      context: ckan-ogc/
-      dockerfile: Dockerfile.ghcr.dev
+      context: .
+      dockerfile: ckan-ogc/Dockerfile.ghcr.dev
     env_file:
       - .env
     logging:

diff --git a/docker-compose.ghcr.yml b/docker-compose.ghcr.yml
@@ -4,8 +4,8 @@ services:
   ogc2ckan:
     container_name: ckan-ogc
     build:
-      context: ckan-ogc/
-      dockerfile: Dockerfile.ghcr
+      context: .
+      dockerfile: ckan-ogc/Dockerfile.ghcr
     env_file:
       - .env
     logging:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,8 +4,8 @@ services:
   ogc2ckan:
     container_name: ckan-ogc
     build:
-      context: ckan-ogc/
-      dockerfile: Dockerfile
+      context: .
+      dockerfile: ckan-ogc/Dockerfile
     env_file:
       - .env
     logging: