From 06c2310e3a4fd4800ce83f6eb7ace3a6d51293b2 Mon Sep 17 00:00:00 2001 From: Ben Busby Date: Mon, 30 Sep 2024 10:27:01 -0600 Subject: [PATCH] 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 actions --- .github/workflows/docker_main.yml | 2 +- .github/workflows/docker_tests.yml | 4 ++-- Dockerfile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker_main.yml b/.github/workflows/docker_main.yml index c41b693..f369f47 100644 --- a/.github/workflows/docker_main.yml +++ b/.github/workflows/docker_main.yml @@ -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 diff --git a/.github/workflows/docker_tests.yml b/.github/workflows/docker_tests.yml index 52d1222..fd96b9d 100644 --- a/.github/workflows/docker_tests.yml +++ b/.github/workflows/docker_tests.yml @@ -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 diff --git a/Dockerfile b/Dockerfile index ceaada6..ac3b7fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ @@ -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