summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYehonal <yehonal.azeroth@gmail.com>2022-11-07 23:55:15 +0100
committerYehonal <yehonal.azeroth@gmail.com>2022-11-07 23:55:15 +0100
commit8533b549979230e78824b7377876934895630306 (patch)
tree666a56576e5f177733b6353e1f83c7898e66e311
parent0764d0d6b8737230fd55c7e265290382fccd6628 (diff)
fix(CI/docker): checkout the entire history
Restored old cache_from
-rw-r--r--.github/workflows/docker_build.yml10
-rw-r--r--docker-compose.yml14
2 files changed, 13 insertions, 11 deletions
diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
index 7bbb7d606b..99fdaf40d6 100644
--- a/.github/workflows/docker_build.yml
+++ b/.github/workflows/docker_build.yml
@@ -47,8 +47,9 @@ jobs:
docker compose version
- uses: actions/checkout@v3
- with:
- fetch-depth: 2
+ # we need the entire history for the ac-dev-server
+ # with:
+ # fetch-depth: 2
# - name: Set up Docker Buildx
# uses: docker/setup-buildx-action@v1
@@ -121,8 +122,9 @@ jobs:
docker compose version
- uses: actions/checkout@v3
- with:
- fetch-depth: 2
+ # we need the entire history for the ac-dev-server
+ # with:
+ # fetch-depth: 2
# - name: Set up Docker Buildx
# uses: docker/setup-buildx-action@v1
diff --git a/docker-compose.yml b/docker-compose.yml
index 30444833a2..45df46fc2c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,13 +14,13 @@ x-build-params: &build-params
DOCKER_USER: ${DOCKER_USER:-acore}
# BUILDKIT_INLINE_CACHE: 1
cache_from:
- - registry.hub.docker.com/acore/ac-wotlk-authserver:${DOCKER_IMAGE_TAG:-master}
- - registry.hub.docker.com/acore/ac-wotlk-authserver-local:${DOCKER_IMAGE_TAG:-master}
- - registry.hub.docker.com/acore/ac-wotlk-worldserver:${DOCKER_IMAGE_TAG:-master}
- - registry.hub.docker.com/acore/ac-wotlk-worldserver-local:${DOCKER_IMAGE_TAG:-master}
- - registry.hub.docker.com/acore/ac-wotlk-dev-server:${DOCKER_IMAGE_TAG:-master}
- - registry.hub.docker.com/acore/ac-wotlk-tools:${DOCKER_IMAGE_TAG:-master}
- - registry.hub.docker.com/acore/ac-wotlk-client-data:${DOCKER_IMAGE_TAG:-master}
+ - acore/ac-wotlk-authserver:${DOCKER_IMAGE_TAG:-master}
+ - acore/ac-wotlk-authserver-local:${DOCKER_IMAGE_TAG:-master}
+ - acore/ac-wotlk-worldserver:${DOCKER_IMAGE_TAG:-master}
+ - acore/ac-wotlk-worldserver-local:${DOCKER_IMAGE_TAG:-master}
+ - acore/ac-wotlk-dev-server:${DOCKER_IMAGE_TAG:-master}
+ - acore/ac-wotlk-tools:${DOCKER_IMAGE_TAG:-master}
+ - acore/ac-wotlk-client-data:${DOCKER_IMAGE_TAG:-master}
x-ac-shared-conf: &ac-shared-conf
<<: *networks