Skip to content

Commit

Permalink
Gitlab CI: Fix path to docker file.
Browse files Browse the repository at this point in the history
  • Loading branch information
Esme Povirk committed Mar 16, 2024
1 parent d71617b commit dd61848
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tools/ci/build.docker
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
echo 'exit 101' >> /usr/sbin/policy-rc.d && \
chmod +x /usr/sbin/policy-rc.d && \
apt-get update && \
apt-get install -y git build-essential ca-certificates autoconf libtool automake cmake python3 gettext wget wine64 wine64-tools libgdiplus zip && \
apt-get install -y git build-essential ca-certificates autoconf libtool automake cmake python3 gettext wget wine64 wine64-tools libgdiplus zip && \
apt-get clean && \
useradd -m gitlab

Expand Down
2 changes: 1 addition & 1 deletion tools/ci/image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ build-image-build:
variables:
IMAGE_SOURCE: "$CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX/debian:bookworm"
IMAGE_LOCAL: "$CI_REGISTRY_IMAGE:debian-bookworm-build"
DOCKER_FILE: "$CI_PROJECT_DIR/scripts/ci/build.docker"
DOCKER_FILE: "$CI_PROJECT_DIR/tools/ci/build.docker"
script:
- mkdir -p /kaniko/.docker
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"},\"$CI_DEPENDENCY_PROXY_SERVER\":{\"auth\":\"$(printf "%s:%s" "$CI_DEPENDENCY_PROXY_USER" "$CI_DEPENDENCY_PROXY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
Expand Down

0 comments on commit dd61848

Please sign in to comment.