Skip to content

Commit 6ba8688

Browse files
add-dnsutils-to-stackql-image (#559)
Summary: - Add `dnsutils` to docker image. - Supports useful IAC workloads. - Update `wsl` runner to install `ubuntu` and use `venv` in testing.
1 parent b843207 commit 6ba8688

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -978,13 +978,15 @@ jobs:
978978

979979
- name: Setup WSL with dependencies
980980
# uses: Vampire/setup-wsl@v1
981-
uses: Vampire/setup-wsl@v3.0.0
981+
uses: Vampire/setup-wsl@v6.0.0
982982
with:
983+
distribution: Ubuntu-24.04
983984
additional-packages:
984985
openssl
985986
postgresql
986987
python3
987988
python3-pip
989+
python3-venv
988990
sqlite3
989991
wsl-conf: |
990992
[automount]
@@ -998,11 +1000,16 @@ jobs:
9981000
9991001
- shell: wsl-bash -u root {0}
10001002
name: Install Python dependencies
1001-
run: pip3 install -r cicd/requirements.txt
1003+
run: |
1004+
python3 -m venv .venv;
1005+
source .venv/bin/activate;
1006+
pip3 install -r cicd/requirements.txt;
10021007
10031008
- shell: wsl-bash {0}
10041009
name: Generate rewritten registry for simulations
1005-
run: python3 test/python/stackql_test_tooling/registry_rewrite.py --srcdir "$(pwd)/test/registry/src" --destdir "$(pwd)/test/registry-mocked/src"
1010+
run: |
1011+
source .venv/bin/activate;
1012+
python3 test/python/stackql_test_tooling/registry_rewrite.py --srcdir "$(pwd)/test/registry/src" --destdir "$(pwd)/test/registry-mocked/src"
10061013
10071014
- shell: wsl-bash {0}
10081015
name: Create certificates for robot tests
@@ -1028,6 +1035,7 @@ jobs:
10281035
export BUILDPATCHVERSION="${BUILDPATCHVERSION}"
10291036
fi
10301037
export PYTHONPATH="$(pwd)/test/python"
1038+
source .venv/bin/activate;
10311039
python3 cicd/python/build.py --robot-test --config='{ "variables": { "IS_WSL": true } }'
10321040
10331041
- shell: wsl-bash {0}
@@ -1064,6 +1072,7 @@ jobs:
10641072
pgrep -f flask | xargs kill -9 || true
10651073
echo "## End ##"
10661074
export PYTHONPATH="$(pwd)/test/python"
1075+
source .venv/bin/activate;
10671076
python3 cicd/python/build.py --robot-test-integration --config='{ "variables": { "IS_WSL": true } }'
10681077
10691078
macosbuild:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ ENV PATH="${APP_DIR}:${PATH}"
162162
COPY --from=integration ${TEST_ROOT_DIR}/build/stackql ${APP_DIR}/
163163

164164
RUN apt-get update \
165-
&& apt-get install -y ca-certificates openssl netcat-traditional jq \
165+
&& apt-get install -y ca-certificates openssl netcat-traditional jq dnsutils \
166166
&& update-ca-certificates
167167

168168
EXPOSE ${STACKQL_PG_PORT}/tcp

0 commit comments

Comments
 (0)