Move docker-related files to docker directory (#1116)

Author: kamilkisiela

.github/workflows/build-and-dockerize.yaml

@@ -124,7 +124,7 @@ jobs:
           BUILD_STABLE: ${{ inputs.publishLatest && '1' || '' }}
         with:
           push: true
-          files: docker.hcl
+          files: docker/docker.hcl
           targets: ${{ inputs.targets }}
           set: |
             *.cache-from=type=gha

.github/workflows/tests-e2e.yaml

@@ -44,17 +44,17 @@ jobs:
       - name: patch compose file volumes
         uses: mikefarah/yq@v4.30.8
         with:
-          cmd: yq -i 'del(.services.*.volumes)' docker-compose.community.yml
+          cmd: yq -i 'del(.services.*.volumes)' docker/docker-compose.community.yml
 
       - name: run containers
         timeout-minutes: 10
-        run: docker compose -f docker-compose.community.yml up -d --wait
+        run: docker compose -f docker/docker-compose.community.yml up -d --wait
 
       - name: troubleshoot containers
         if: ${{ failure() }}
         run: |
-          docker compose -f docker-compose.community.yml ps
-          docker compose -f docker-compose.community.yml logs
+          docker compose -f docker/docker-compose.community.yml ps
+          docker compose -f docker/docker-compose.community.yml logs
 
       - name: cypress
         timeout-minutes: 6

.github/workflows/tests-integration.yaml

@@ -44,7 +44,7 @@ jobs:
       - name: patch compose file volumes
         uses: mikefarah/yq@v4.30.8
         with:
-          cmd: yq -i 'del(.services.*.volumes)' docker-compose.community.yml
+          cmd: yq -i 'del(.services.*.volumes)' docker/docker-compose.community.yml
 
       - name: get cpu count for jest
         id: cpu-cores
@@ -53,13 +53,13 @@ jobs:
       - name: run containers
         timeout-minutes: 8
         run: |
-          docker compose -f docker-compose.community.yml -f ./integration-tests/docker-compose.integration.yaml --env-file ./integration-tests/.env up -d --wait
+          docker compose -f docker/docker-compose.community.yml -f ./integration-tests/docker-compose.integration.yaml --env-file ./integration-tests/.env up -d --wait
 
       - name: troubleshoot containers
         if: ${{ failure() }}
         run: |
-          docker compose -f docker-compose.community.yml -f ./integration-tests/docker-compose.integration.yaml --env-file ./integration-tests/.env ps
-          docker compose -f docker-compose.community.yml -f ./integration-tests/docker-compose.integration.yaml --env-file ./integration-tests/.env logs
+          docker compose -f docker/docker-compose.community.yml -f ./integration-tests/docker-compose.integration.yaml --env-file ./integration-tests/.env ps
+          docker compose -f docker/docker-compose.community.yml -f ./integration-tests/docker-compose.integration.yaml --env-file ./integration-tests/.env logs
 
       - name: run integration tests
         timeout-minutes: 10
@@ -71,4 +71,4 @@ jobs:
       - name: log dump
         if: ${{ failure() }}
         run: |
-          docker compose -f docker-compose.community.yml -f ./integration-tests/docker-compose.integration.yaml --env-file ./integration-tests/.env logs
+          docker compose -f docker/docker-compose.community.yml -f ./integration-tests/docker-compose.integration.yaml --env-file ./integration-tests/.env logs

.yarnrc

@@ -5,7 +5,7 @@ let loadedConfig: any = null;
 
 export function getLocalComposeConfig() {
   if (!loadedConfig) {
-    loadedConfig = yaml.load(readFileSync('../docker-compose.community.yml', 'utf8'));
+    loadedConfig = yaml.load(readFileSync('../docker/docker-compose.community.yml', 'utf8'));
   }
 
   return {

deployment/utils/local-config.ts

@@ -49,28 +49,28 @@ function "image_tag" {
 }
 
 target "migrations-base" {
-  dockerfile = "${PWD}/migrations.dockerfile"
+  dockerfile = "${PWD}/docker/migrations.dockerfile"
   args = {
     RELEASE = "${RELEASE}"
   }
 }
 
 target "service-base" {
-  dockerfile = "${PWD}/services.dockerfile"
+  dockerfile = "${PWD}/docker/services.dockerfile"
   args = {
     RELEASE = "${RELEASE}"
   }
 }
 
 target "app-base" {
-  dockerfile = "${PWD}/app.dockerfile"
+  dockerfile = "${PWD}/docker/app.dockerfile"
   args = {
     RELEASE = "${RELEASE}"
   }
 }
 
 target "router-base" {
-  dockerfile = "${PWD}/router.dockerfile"
+  dockerfile = "${PWD}/docker/router.dockerfile"
   args = {
     RELEASE = "${RELEASE}"
   }

app.dockerfile renamed to docker/app.dockerfile

@@ -5,4 +5,4 @@
 ![Design Diagram](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/kamilkisiela/graphql-hive/main/docs/architecture.puml)
 
 Note: The relationships in this diagram is based on
-[this docker-compose](https://github.com/kamilkisiela/graphql-hive/blob/main/docker-compose.community.yml)
+[this docker-compose](https://github.com/kamilkisiela/graphql-hive/blob/main/docker/docker-compose.community.yml)

docker-compose.community.yml renamed to docker/docker-compose.community.yml

@@ -37,15 +37,15 @@ export DOCKER_TAG=":local"
 ```
 
 6. Compile a local Docker image by running:
-   `docker buildx bake -f docker.hcl integration-tests --load`
+   `docker buildx bake -f docker/docker.hcl integration-tests --load`
 7. Use Docker Compose to run the built containers (based on `community` compose file), along with
    the extra containers:
 
 ```
 export DOCKER_TAG=":local"
 export DOCKER_REGISTRY=""
 
-docker compose -f docker-compose.community.yml -f ./integration-tests/docker-compose.integration.yaml --env-file ./integration-tests/.env up -d --wait
+docker compose -f ./docker/docker-compose.community.yml -f ./integration-tests/docker-compose.integration.yaml --env-file ./integration-tests/.env up -d --wait
 ```
 
 8. Run the tests: `pnpm --filter integration-tests test:integration`
@@ -66,7 +66,7 @@ To run integration tests locally, from the pre-build Docker image, follow:
 export DOCKER_REGISTRY="ghcr.io/kamilkisiela/graphql-hive/"
 export DOCKER_TAG=":IMAGE_TAG_HERE"
 
-docker compose -f docker-compose.community.yml -f ./integration-tests/docker-compose.integration.yaml --env-file ./integration-tests/.env up -d --wait
+docker compose -f ./docker/docker-compose.community.yml -f ./integration-tests/docker-compose.integration.yaml --env-file ./integration-tests/.env up -d --wait
 ```
 
 6. Run the tests: `pnpm --filter integration-tests test:integration`
@@ -95,9 +95,9 @@ export BUILD_TYPE=""
 export DOCKER_TAG=":local"
 ```
 
-6. Compile a local Docker image by running: `docker buildx bake -f docker.hcl build --load`
+6. Compile a local Docker image by running: `docker buildx bake -f docker/docker.hcl build --load`
 7. Run the e2e environment, by running:
-   `docker compose -f docker-compose.community.yml --env-file ./integration-tests/.env up -d --wait`
+   `docker compose -f ./docker/docker-compose.community.yml --env-file ./integration-tests/.env up -d --wait`
 8. Run Cypress: `pnpm test:e2e`
 
 #### Running from pre-built Docker image
@@ -117,7 +117,7 @@ export DOCKER_TAG=":IMAGE_TAG_HERE"
 ```
 
 6. Run the e2e environment, by running:
-   `docker compose -f docker-compose.community.yml --env-file ./integration-tests/.env up -d --wait`
+   `docker compose -f ./docker/docker-compose.community.yml --env-file ./integration-tests/.env up -d --wait`
 7. Run Cypress: `pnpm test:e2e`
 
 #### Docker Compose configuration

docker-compose.dev.yml renamed to docker/docker-compose.dev.yml

@@ -1,4 +1,4 @@
-# Note: this is an overrides file for docker-compose.community.yml:
+# Note: this is an overrides file for ./docker/docker-compose.community.yml:
 # It's used for setting special environment and configurations for running integration tests.
 # This file also includes services that only exists in Hive's SaaS version, and are not available in the self-hosted version.
 # Please refer to TESTING.md for more information.

docker.hcl renamed to docker/docker.hcl

@@ -23,14 +23,14 @@
     "build:libraries": "pnpm graphql:generate && pnpm turbo build --filter=./packages/libraries/* --color",
     "build:services": "pnpm turbo build  --filter=./packages/services/**/* --color",
     "build:web": "pnpm turbo build --filter=./packages/web/* --color",
-    "docker:build": "docker buildx bake -f docker.hcl --load build",
+    "docker:build": "docker buildx bake -f docker/docker.hcl --load build",
     "env:sync": "node ./scripts/sync-env-files.js",
     "generate": "pnpm --filter @hive/storage db:generate && pnpm graphql:generate",
     "graphql:generate": "graphql-codegen",
     "lint": "eslint --cache --ignore-path .gitignore \"{packages,cypress}/**/*.{ts,tsx}\"",
     "lint:fix": "pnpm lint --fix",
     "lint:prettier": "prettier --cache --check .",
-    "local:setup": "docker-compose -f docker-compose.dev.yml up -d --remove-orphans && pnpm --filter @hive/migrations db:init",
+    "local:setup": "docker-compose -f ./docker/docker-compose.dev.yml up -d --remove-orphans && pnpm --filter @hive/migrations db:init",
     "postinstall": "node ./scripts/patch-manifests.js && pnpm env:sync && node ./scripts/turborepo-cleanup.js && node ./scripts/turborepo-setup.js",
     "pre-commit": "exit 0 && lint-staged",
     "prepare": "husky install",

migrations.dockerfile renamed to docker/migrations.dockerfile

@@ -40,11 +40,11 @@ in less than 15 minutes.
 ## Running GraphQL Hive
 
 First download the `docker-compose.community.yml` file from the
-[GitHub repository](https://github.com/kamilkisiela/graphql-hive/blob/main/docker-compose.community.yml)
+[GitHub repository](https://github.com/kamilkisiela/graphql-hive/blob/main/docker/docker-compose.community.yml)
 using `wget`.
 
 ```bash
-wget https://raw.githubusercontent.com/kamilkisiela/graphql-hive/main/docker-compose.community.yml
+wget https://raw.githubusercontent.com/kamilkisiela/graphql-hive/main/docker/docker-compose.community.yml
 ```
 
 After downloading the file, you need to set some environment variables.