Skip to content

Commit

Permalink
Enable docker image test (#2545)
Browse files Browse the repository at this point in the history
  • Loading branch information
what-the-functor authored Feb 20, 2024
1 parent 1ac1705 commit be119f5
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 2 deletions.
4 changes: 4 additions & 0 deletions Dockerfile.testing
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,8 @@ FROM fluidity/build-container:latest

RUN go mod download

COPY .semgrep .semgrep

COPY tests tests

ENTRYPOINT make test
25 changes: 25 additions & 0 deletions Dockerfile.testing.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
.git
cmd
web
contracts
automation
!automation/nginx-default.conf
docs

**/*.o
**/*.out
*.out
*.o

lib/build-lib
common/build-common

database/build/**
database/build
database/db

deployment_list.json

# Vendor specific
.vscode
.DS_Store
14 changes: 12 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ AUTOMATION_DIR := automation
test \
test-go \
test-contracts \
test-docker \
docker-test \
install

Expand Down Expand Up @@ -93,6 +94,15 @@ docker-node: docker-build

@touch docker-node

docker-testing: docker
@${DOCKER_BUILD} \
${DOCKERFLAGS} \
-t ${ORG_ROOT}/docker-testing-container \
-f Dockerfile.testing \
.

@touch docker-test

docker: \
docker-root \
docker-root-web \
Expand All @@ -102,8 +112,8 @@ docker: \
docker-build-web \
docker-node

docker-test: docker
@${DOCKER_RUN} -f Dockerfile.test
test-docker: docker-testing
@${DOCKER_RUN} ${ORG_ROOT}/docker-testing-container

docker-compose-build:
@./scripts/docker-compose-all.sh build
Expand Down
1 change: 1 addition & 0 deletions build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ NPM_INSTALL := npm install

DOCKER_BUILD := docker build
DOCKER_COMPOSE := docker-compose
DOCKER_RUN := docker run

SEMGREP_ALL := semgrep --config p/ci --config p/secrets

Expand Down

0 comments on commit be119f5

Please sign in to comment.