diff --git a/.dockerignore b/.dockerignore index 94b549649..b825bcd1f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,46 @@ .git .win32 .examples +*.swp +*~ +\#*# +.#* +.edts +*.dump +/Makefile +/config.log +/config.status +/config/releases.exs +/configure +/aclocal.m4 +/*.cache +/deps/ +/.deps-update/ +/ebin/ +/ejabberd.init +/ejabberd.service +/ejabberdctl +/ejabberdctl.example +/rel/ejabberd/ +/rel/overlays/ +/src/eldap_filter_yecc.erl +/vars.config +/dialyzer/ +/test/*.beam +/test/*.ctc +/logs/ +/priv/bin/captcha*sh +/priv/sql +/rel/ejabberd +/_build +/database/ +/.rebar +/rebar.lock +/log/ +Mnesia.nonode@nohost/ +# Binaries created with tools/make-{binaries,installers,packages}: +/ejabberd_*.deb +/ejabberd-*.rpm +/ejabberd-*.run +/ejabberd-*.tar.gz + diff --git a/.github/container/Dockerfile b/.github/container/Dockerfile index a879a125d..4f4b78970 100644 --- a/.github/container/Dockerfile +++ b/.github/container/Dockerfile @@ -1,5 +1,4 @@ FROM alpine:3.15.4 AS build -ARG REPOSITORY=https://github.com/processone/ejabberd.git ARG VERSION=master RUN apk upgrade --update musl \ @@ -29,11 +28,11 @@ RUN apk upgrade --update musl \ RUN mix local.hex --force \ && mix local.rebar --force +COPY . ./ejabberd + WORKDIR ejabberd -RUN git clone $REPOSITORY . \ - && git checkout $VERSION \ - && mv .github/container/ejabberdctl.template . \ +RUN mv .github/container/ejabberdctl.template . \ && ./autogen.sh \ && ./configure --with-rebar=mix --enable-all \ && make deps \ diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index a246e3640..ccf7dac83 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -58,11 +58,11 @@ jobs: uses: docker/build-push-action@v2.10.0 with: build-args: | - REPOSITORY=https://github.com/${{ github.repository }}.git VERSION=${{ steps.gitdescribe.outputs.ver }} cache-from: type=gha cache-to: type=gha,mode=max - context: .github/container + context: . + file: .github/container/Dockerfile labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64,linux/arm64 push: true