Provide correct path to compose files

In release-engineering#421, I modified the context and paths to both go up a directory. That was an error. I should have just modified one. This provides the context to be the root directory so all paths are relative to that. Signed-off-by: arewm <arewm@users.noreply.github.com>
arewm · Sep 15, 2022 · e170820 · e170820
1 parent abdc8c8
commit e170820
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/compose-files/docker-compose.yml b/compose-files/docker-compose.yml
@@ -29,9 +29,9 @@ services:
       REGISTRY_AUTH_HTPASSWD_PATH: /auth/htpasswd
       REGISTRY_AUTH_HTPASSWD_REALM: Registry Realm
     volumes:
-      - ../iib_data/registry:/var/lib/registry:z
+      - ./iib_data/registry:/var/lib/registry:z
       - registry-certs-volume:/certs:z
-      - ../docker/registry/auth:/auth:z
+      - ./docker/registry/auth:/auth:z
     depends_on:
       - minica
 
@@ -64,7 +64,7 @@ services:
   iib-api:
     build:
       context: ..
-      dockerfile: ../docker/Dockerfile-api
+      dockerfile: ./docker/Dockerfile-api
     command:
       - /bin/sh
       - -c
@@ -83,8 +83,8 @@ services:
       FLASK_APP: iib/web/wsgi.py
       IIB_DEV: 'true'
     volumes:
-      - ../:/src:z
-      - ../docker/message_broker/certs:/broker-certs:ro,z
+      - ./:/src:z
+      - ./docker/message_broker/certs:/broker-certs:ro,z
       - request-logs-volume:/var/log/iib/requests:z
       - request-related-bundles-volume:/var/lib/requests/related_bundles:z
       - request-recursive-related-bundles-volume:/var/lib/requests/recursive_related_bundles:z
@@ -97,7 +97,7 @@ services:
   iib-worker:
     build:
       context: ..
-      dockerfile: ../docker/Dockerfile-workers
+      dockerfile: ./docker/Dockerfile-workers
     # Override the default command so that Celery auto-reloads on code changes.
     # This also adds the self-signed CA that was used to sign the Docker registry's certificate
     # to the trusted CA bundle. This will make podman trust the local Docker registry's certificate.
@@ -119,10 +119,10 @@ services:
     # Make this privileged to be able to build container images
     privileged: true
     volumes:
-      - ../:/src:z
+      - ./:/src:z
       - worker_container_storage:/var/lib/containers:z
       - registry-certs-volume:/registry-certs:ro,z
-      - ../ca-bundle.crt:/host-ca-bundle.crt:ro
+      - ./ca-bundle.crt:/host-ca-bundle.crt:ro
       - request-logs-volume:/var/log/iib/requests:z
       - request-related-bundles-volume:/var/lib/requests/related_bundles:z
       - request-recursive-related-bundles-volume:/var/lib/requests/recursive_related_bundles:z
@@ -136,10 +136,10 @@ services:
   message-broker:
     build:
       context: ..
-      dockerfile: ../docker/message_broker/Dockerfile
+      dockerfile: ./docker/message_broker/Dockerfile
     volumes:
       - message-broker-volume:/opt/activemq/data:z
-      - ../docker/message_broker/certs:/broker-certs:ro,z
+      - ./docker/message_broker/certs:/broker-certs:ro,z
     ports:
       - 5671:5671   # amqp+ssl
       - 5672:5672   # amqp

diff --git a/compose-files/podman-compose.yml b/compose-files/podman-compose.yml
@@ -29,9 +29,9 @@ services:
       REGISTRY_AUTH_HTPASSWD_PATH: /auth/htpasswd
       REGISTRY_AUTH_HTPASSWD_REALM: Registry Realm
     volumes:
-      - ../iib_data/registry:/var/lib/registry
+      - ./iib_data/registry:/var/lib/registry
       - registry-certs-volume:/certs:z
-      - ../docker/registry/auth:/auth
+      - ./docker/registry/auth:/auth
     # depends_on: # yamllint disable-line comments-indentation
     #   - minica  # yamllint disable-line comments-indentation
 
@@ -64,7 +64,7 @@ services:
   iib-api:
     build:
       context: ..
-      dockerfile: ../docker/Dockerfile-api
+      dockerfile: ./docker/Dockerfile-api
     command:
       - /bin/sh
       - -c
@@ -83,8 +83,8 @@ services:
       FLASK_APP: iib/web/wsgi.py
       IIB_DEV: 'true'
     volumes:
-      - ../:/src
-      - ../docker/message_broker/certs:/broker-certs
+      - ./:/src
+      - ./docker/message_broker/certs:/broker-certs
       - request-logs-volume:/var/log/iib/requests:z
       - request-related-bundles-volume:/var/lib/requests/related_bundles:z
       - request-recursive-related-bundles-volume:/var/lib/requests/recursive_related_bundles:z
@@ -97,7 +97,7 @@ services:
   iib-worker:
     build:
       context: ..
-      dockerfile: ../docker/Dockerfile-workers
+      dockerfile: ./docker/Dockerfile-workers
     # Override the default command so that Celery auto-reloads on code changes.
     # This also adds the self-signed CA that was used to sign the Docker registry's certificate
     # to the trusted CA bundle. This will make podman trust the local Docker registry's certificate.
@@ -119,11 +119,11 @@ services:
     # Make this privileged to be able to build container images
     privileged: true
     volumes:
-      - ../:/src
+      - ./:/src
       - worker_container_storage:/var/lib/containers:z
       # - ./docker/registry/certs:/registry-certs
       - registry-certs-volume:/registry-certs
-      - ../ca-bundle.crt:/host-ca-bundle.crt
+      - ./ca-bundle.crt:/host-ca-bundle.crt
       - request-logs-volume:/var/log/iib/requests:z
       - request-related-bundles-volume:/var/lib/requests/related_bundles:z
       - request-recursive-related-bundles-volume:/var/lib/requests/recursive_related_bundles:z
@@ -137,10 +137,10 @@ services:
   message-broker:
     build:
       context: ..
-      dockerfile: ../docker/message_broker/Dockerfile
+      dockerfile: ./docker/message_broker/Dockerfile
     volumes:
       - message-broker-volume:/opt/activemq/data:z
-      - ../docker/message_broker/certs:/broker-certs
+      - ./docker/message_broker/certs:/broker-certs
     ports:
       - 5671:5671   # amqp+ssl
       - 5672:5672   # amqp