diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9d34eb7..d0d30e4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,7 +15,7 @@ jobs: PGPASSWORD: temba strategy: matrix: - ARCHIVER_VERSION: ["6.4.0", "7.0.0", "7.2.0"] + ARCHIVER_VERSION: ["8.0.0"] steps: - uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v1 @@ -50,9 +50,11 @@ jobs: psql -h localhost -d temba -U temba -f ci/database.sql - name: Test image run: | - docker run --name archiver --env-file docker.envfile --link postgis --link localstack_main --publish 8080:8080 --detach archiver + docker run --name archiver --env-file docker.envfile --link postgis --link localstack-main --publish 8080:8080 --detach archiver + timeout ${{env.GREP_TIMEOUT}} grep -m 1 'db ok' <(docker logs --follow archiver 2>&1) timeout ${{env.GREP_TIMEOUT}} grep -m 1 's3 bucket ok' <(docker logs --follow archiver 2>&1) - timeout ${{env.GREP_TIMEOUT}} grep -m 1 'Sleeping until next UTC day' <(docker logs --follow archiver 2>&1) + timeout ${{env.GREP_TIMEOUT}} grep -m 1 'tmp file access ok' <(docker logs --follow archiver 2>&1) + timeout ${{env.GREP_TIMEOUT}} grep -m 1 'sleeping until next archival' <(docker logs --follow archiver 2>&1) grep -v 'error' <(docker logs archiver 2>&1) - name: debug outputs if: always() @@ -60,6 +62,7 @@ jobs: docker ps docker images docker logs archiver + docker logs localstack-main - name: Create image tags uses: docker/metadata-action@v3 id: tags diff --git a/Dockerfile b/Dockerfile index b232b32..a09eb4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN wget -q -O archiver.tar.gz "https://github.com/$ARCHIVER_REPO/releases/downl RUN mkdir archiver RUN tar -xzC archiver -f archiver.tar.gz -FROM debian:stretch-slim +FROM debian:bullseye-slim RUN set -ex; \ addgroup --system archiver; \ @@ -24,4 +24,4 @@ COPY --from=build archiver/rp-archiver /usr/local/bin USER archiver ENTRYPOINT [] -CMD ["rp-archiver"] \ No newline at end of file +CMD ["rp-archiver"] diff --git a/docker.envfile b/docker.envfile index 1d0f2a8..e62ce0c 100644 --- a/docker.envfile +++ b/docker.envfile @@ -1,5 +1,7 @@ ARCHIVER_DB=postgres://temba:temba@postgis/temba?sslmode=disable ARCHIVER_S3_DISABLE_SSL=true ARCHIVER_S3_FORCE_PATH_STYLE=true -ARCHIVER_S3_ENDPOINT=http://localstack_main:4566 -ARCHIVER_LOG_LEVEL=debug \ No newline at end of file +ARCHIVER_S3_ENDPOINT=http://localstack-main:4566 +ARCHIVER_LOG_LEVEL=debug +ARCHIVER_AWS_ACCESS_KEY_ID=root +ARCHIVER_AWS_SECRET_ACCESS_KEY=pass