diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a71fa5556..49ebbd9ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,7 +76,7 @@ jobs: fetch-depth: 2 - name: Build the Docker image - run: docker build -t docs-rs -f docker/Dockerfile . + run: docker build -t docs-rs -f dockerfiles/Dockerfile . - name: Upload the Docker image to ECR uses: rust-lang/simpleinfra/github-actions/upload-docker-image@master diff --git a/docker-compose.yml b/docker-compose.yml index 3146f1f91..2956994b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: web: build: context: . - dockerfile: ./docker/Dockerfile + dockerfile: ./dockerfiles/Dockerfile depends_on: - db - s3 @@ -25,7 +25,7 @@ services: - .env db: build: - context: ./docker + context: ./dockerfiles dockerfile: ./Dockerfile-postgres volumes: - postgres-data:/var/lib/postgresql/data @@ -50,7 +50,7 @@ services: MINIO_SECRET_KEY: secret_key prometheus: build: - context: ./docker + context: ./dockerfiles dockerfile: ./Dockerfile-prometheus ports: - "9090:9090" diff --git a/docker/Dockerfile b/dockerfiles/Dockerfile similarity index 100% rename from docker/Dockerfile rename to dockerfiles/Dockerfile diff --git a/docker/Dockerfile-postgres b/dockerfiles/Dockerfile-postgres similarity index 100% rename from docker/Dockerfile-postgres rename to dockerfiles/Dockerfile-postgres diff --git a/docker/Dockerfile-prometheus b/dockerfiles/Dockerfile-prometheus similarity index 100% rename from docker/Dockerfile-prometheus rename to dockerfiles/Dockerfile-prometheus diff --git a/docker/entrypoint.sh b/dockerfiles/entrypoint.sh similarity index 100% rename from docker/entrypoint.sh rename to dockerfiles/entrypoint.sh diff --git a/docker/install_extensions.sql b/dockerfiles/install_extensions.sql similarity index 100% rename from docker/install_extensions.sql rename to dockerfiles/install_extensions.sql diff --git a/docker/prometheus.yml b/dockerfiles/prometheus.yml similarity index 100% rename from docker/prometheus.yml rename to dockerfiles/prometheus.yml