Skip to content

Commit

Permalink
Update Docker base images, update workflows
Browse files Browse the repository at this point in the history
Should fix issues with tomllib not being available in the docker related
builds, as well as the move from docker-compose to "docker compose" in
gh actions
  • Loading branch information
benbusby committed Sep 30, 2024
1 parent 9bfdd88 commit 06c2310
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ jobs:
- name: build and test (docker-compose)
run: |
docker rm -f whoogle-search-nocompose
WHOOGLE_IMAGE="whoogle-search:test" docker-compose up --detach
WHOOGLE_IMAGE="whoogle-search:test" docker compose up --detach
sleep 15
docker exec whoogle-search curl -f http://localhost:5000/healthz || exit 1
4 changes: 2 additions & 2 deletions .github/workflows/docker_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
docker run --publish 5000:5000 --detach --name whoogle-search-nocompose whoogle-search:test
sleep 15
docker exec whoogle-search-nocompose curl -f http://localhost:5000/healthz || exit 1
- name: build and test (docker-compose)
- name: build and test (docker compose)
run: |
docker rm -f whoogle-search-nocompose
WHOOGLE_IMAGE="whoogle-search:test" docker-compose up --detach
WHOOGLE_IMAGE="whoogle-search:test" docker compose up --detach
sleep 15
docker exec whoogle-search curl -f http://localhost:5000/healthz || exit 1
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11.0a5-alpine as builder
FROM python:3.12.6-alpine3.20 AS builder

RUN apk --update add \
build-base \
Expand All @@ -12,7 +12,7 @@ COPY requirements.txt .
RUN pip install --upgrade pip
RUN pip install --prefix /install --no-warn-script-location --no-cache-dir -r requirements.txt

FROM python:3.11.0a5-alpine
FROM python:3.12.6-alpine3.20

RUN apk add --update --no-cache tor curl openrc libstdc++
# git go //for obfs4proxy
Expand Down

0 comments on commit 06c2310

Please sign in to comment.