Update Docker base images, update workflows
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 actionsmain
parent
9bfdd88a5e
commit
06c2310e3a
|
@ -23,6 +23,6 @@ jobs:
|
||||||
- name: build and test (docker-compose)
|
- name: build and test (docker-compose)
|
||||||
run: |
|
run: |
|
||||||
docker rm -f whoogle-search-nocompose
|
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
|
sleep 15
|
||||||
docker exec whoogle-search curl -f http://localhost:5000/healthz || exit 1
|
docker exec whoogle-search curl -f http://localhost:5000/healthz || exit 1
|
||||||
|
|
|
@ -18,9 +18,9 @@ jobs:
|
||||||
docker run --publish 5000:5000 --detach --name whoogle-search-nocompose whoogle-search:test
|
docker run --publish 5000:5000 --detach --name whoogle-search-nocompose whoogle-search:test
|
||||||
sleep 15
|
sleep 15
|
||||||
docker exec whoogle-search-nocompose curl -f http://localhost:5000/healthz || exit 1
|
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: |
|
run: |
|
||||||
docker rm -f whoogle-search-nocompose
|
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
|
sleep 15
|
||||||
docker exec whoogle-search curl -f http://localhost:5000/healthz || exit 1
|
docker exec whoogle-search curl -f http://localhost:5000/healthz || exit 1
|
||||||
|
|
|
@ -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 \
|
RUN apk --update add \
|
||||||
build-base \
|
build-base \
|
||||||
|
@ -12,7 +12,7 @@ COPY requirements.txt .
|
||||||
RUN pip install --upgrade pip
|
RUN pip install --upgrade pip
|
||||||
RUN pip install --prefix /install --no-warn-script-location --no-cache-dir -r requirements.txt
|
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++
|
RUN apk add --update --no-cache tor curl openrc libstdc++
|
||||||
# git go //for obfs4proxy
|
# git go //for obfs4proxy
|
||||||
|
|
Loading…
Reference in New Issue