Skip to content

Commit b2bab2a

Browse files
committed
chore: fix docker build
1 parent 700dd68 commit b2bab2a

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/docker-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Build and push
2929
uses: docker/build-push-action@v5
3030
with:
31-
context: docker
32-
file: ./Dockerfile
31+
context: ./docker
32+
file: ./docker/Dockerfile
3333
push: true
3434
tags: zzjason/leanstore-dev:latest

docker/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,19 @@ RUN rm -rf /opt/env.sh \
2020
# install vcpkg
2121
RUN git clone --depth 1 https://github.com/Microsoft/vcpkg.git /opt/vcpkg \
2222
&& mv /opt/vcpkg/triplets/x64-linux.cmake /opt/vcpkg/triplets/x64-linux-static.cmake \
23+
&& mkdir -p /opt/vcpkg_cache \
2324
&& echo 'export VCPKG_ROOT=/opt/vcpkg' >> /opt/env.sh \
2425
&& echo 'export PATH=$VCPKG_ROOT:$PATH' >> /opt/env.sh \
25-
&& echo 'export VCPKG_FORCE_SYSTEM_BINARIES=1' >> /opt/env.sh
26+
&& echo 'export VCPKG_FORCE_SYSTEM_BINARIES=1' >> /opt/env.sh \
27+
&& echo 'export VCPKG_DEFAULT_BINARY_CACHE=/opt/vcpkg_cache' > /opt/env.sh
2628

2729
COPY vcpkg-triplets/x64-linux.cmake /opt/vcpkg/triplets/x64-linux.cmake
2830
COPY vcpkg-triplets/arm64-linux.cmake /opt/vcpkg/triplets/arm64-linux.cmake
2931

3032
ENV VCPKG_ROOT="/opt/vcpkg"
3133
ENV PATH="$VCPKG_ROOT:$PATH"
3234
ENV VCPKG_FORCE_SYSTEM_BINARIES=1
35+
ENV VCPKG_DEFAULT_BINARY_CACHE=/opt/vcpkg_cache
3336

3437

3538
# install vcpkg packages

0 commit comments

Comments
 (0)