Skip to content

Commit

Permalink
fix: try different mount
Browse files Browse the repository at this point in the history
Signed-off-by: osamamagdy <[email protected]>
  • Loading branch information
osamamagdy committed May 9, 2024
1 parent 32cd98d commit 4dc644e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ jobs:
with:
go-version-file: 'go.mod'

- run: go mod download

- uses: dorny/paths-filter@v3
id: filter
with:
Expand All @@ -62,10 +60,9 @@ jobs:
env:
DOCKER_DEV_CI_MODE: 1
DOCKER_QUIET_BUILD: 1
run: |
DOCKER_DEV_RUN_OPTS="-v ~/go/pkg/mod/:/project/pkg/mod/"
run: |
DOCKER_BUILD_OPTS="--build-arg UBUNTU_VERSION=${{ matrix.os-version }} --build-arg UBUNTU_NAME=${{ matrix.os-name }}" \
make -C utils/docker run-dev DOCKER_DEV_OPTIONAL_CMD='env IS_CI_RUNNING=true \
make -C utils/docker run-dev PACKAGE_MOUNT='-v ~/go/pkg/mod/:/project/pkg/mod/' DOCKER_DEV_OPTIONAL_CMD='env IS_CI_RUNNING=true \
make all'
#
# continue only if we push to main and rebuild docker images
Expand Down
4 changes: 4 additions & 0 deletions utils/docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,15 @@ endif
# allows to override with `buildx build`
DOCKER_BUILD_CMD ?= build

# allows docker to look for packages mounted on the host
PACKAGE_MOUNT ?=

# Docker run options
# ------------------
DOCKER_DEV_RUN_OPTS ?=
DOCKER_DEV_RUN_OPTS += --rm
# - mount local packages from the host to activate caching
DOCKER_DEV_RUN_OPTS += $(PACKAGE_MOUNT)
# - import docker daemon socket (so dev container can run docker)
DOCKER_DEV_RUN_OPTS += -v "$(DOCKER_DAEMON_SOCKET)":"$(DOCKER_SOCKET)"
# - mount local fpc repo into the dev container so development inside container is
Expand Down

0 comments on commit 4dc644e

Please sign in to comment.