From 2b2311c0bf27304d9c98fae2ec986032fd7eb731 Mon Sep 17 00:00:00 2001 From: Ilya Vassyutovich Date: Sun, 14 Jul 2024 18:00:08 +0300 Subject: [PATCH 1/2] Add Docker pipeline --- .github/workflows/push-docker-image.yaml | 44 +++++++++++++++++++++++ Dockerfile | 45 ++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 .github/workflows/push-docker-image.yaml create mode 100644 Dockerfile diff --git a/.github/workflows/push-docker-image.yaml b/.github/workflows/push-docker-image.yaml new file mode 100644 index 0000000..3876ea4 --- /dev/null +++ b/.github/workflows/push-docker-image.yaml @@ -0,0 +1,44 @@ +name: Push Docker image + +on: + push: + tags: [ 'v*.*.*' ] + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + +jobs: + main: + name: Build and push Docker image + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4.1.7 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3.4.0 + + - name: Log into registry ${{ env.REGISTRY }} + uses: docker/login-action@v3.2.0 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract Docker metadata + id: meta + uses: docker/metadata-action@v5.5.1 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + + - name: Build and push Docker image + id: build-and-push + uses: docker/build-push-action@v6.3.0 + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha + cache-to: type=gha,mode=max diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..68a5e7b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,45 @@ +# Shared layer with dependencies +FROM alpine:3.20.1 AS shared + +## Install shared dependencies +RUN apk update +RUN apk add --no-cache openssl +RUN apk add --no-cache make +RUN apk add --no-cache lua5.1 +RUN apk add --no-cache pcre2 + + + +# Build layer with dev-dependencies +FROM shared AS build + +## Install build dependencies +RUN apk add --no-cache openssl-dev +RUN apk add --no-cache alpine-sdk +RUN apk add --no-cache lua5.1-dev +RUN apk add --no-cache pcre2-dev + + +## Build imapfilter +WORKDIR /dist +COPY ./ /dist/ +RUN make all + + + +# Final layer with installed imapfilter +FROM shared AS final + +## Install imapfilter +COPY --from=build /dist /dist +WORKDIR /dist +RUN make install + + +# Clean-up dist +RUN rm -rf /dist + + +WORKDIR / + +ENTRYPOINT [ "imapfilter" ] From 0ad3fdbdd6c892833457cdf6fa8f4345efd0fbb4 Mon Sep 17 00:00:00 2001 From: Ilya Vassyutovich Date: Mon, 5 May 2025 22:28:32 +0300 Subject: [PATCH 2/2] Rewrite after review and improve --- Dockerfile | 60 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/Dockerfile b/Dockerfile index 68a5e7b..573aaab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,45 +1,55 @@ # Shared layer with dependencies -FROM alpine:3.20.1 AS shared +FROM alpine:3.21.3 AS shared -## Install shared dependencies -RUN apk update -RUN apk add --no-cache openssl -RUN apk add --no-cache make -RUN apk add --no-cache lua5.1 -RUN apk add --no-cache pcre2 +RUN apk add --no-cache \ + lua5.4 \ + make \ + openssl \ + pcre2 -# Build layer with dev-dependencies -FROM shared AS build +# Build dependencies +FROM shared AS build-deps -## Install build dependencies -RUN apk add --no-cache openssl-dev -RUN apk add --no-cache alpine-sdk -RUN apk add --no-cache lua5.1-dev -RUN apk add --no-cache pcre2-dev +RUN apk add --no-cache \ + alpine-sdk \ + lua5.4-dev \ + openssl-dev \ + pcre2-dev -## Build imapfilter + +# Build layer +FROM build-deps AS build + +RUN git clone https://github.com/lefcha/imapfilter.git /dist WORKDIR /dist -COPY ./ /dist/ -RUN make all +RUN make \ + INCDIRS=-I/usr/include/lua5.4 \ + LDFLAGS='-L/usr/lib/lua5.4' \ + LIBLUA=-llua \ + LUA_CFLAGS=-I/usr/include/lua5.4 # Final layer with installed imapfilter FROM shared AS final -## Install imapfilter COPY --from=build /dist /dist WORKDIR /dist -RUN make install - - -# Clean-up dist -RUN rm -rf /dist +RUN make install \ + && rm -rf /dist +RUN addgroup abc \ + && adduser \ + --home /home/imapfilter \ + --shell /sbin/nologin \ + --disabled-password \ + --ingroup abc \ + abc -WORKDIR / +USER abc:abc -ENTRYPOINT [ "imapfilter" ] +ENTRYPOINT [ "/usr/local/bin/imapfilter" ] +CMD ["-c", "/config.lua"]