forked from HSWro/hswro_org
try out buildah, maybe it'll work out better
This commit is contained in:
parent
28e88223d5
commit
462d158211
|
|
@ -9,7 +9,6 @@ jobs:
|
||||||
image: git.hswro.org/fleg/hswro_org_build:latest
|
image: git.hswro.org/fleg/hswro_org_build:latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
with:
|
|
||||||
- run: bundle exec jekyll build
|
- run: bundle exec jekyll build
|
||||||
- uses: actions/upload-artifact@v3
|
- uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
|
|
@ -18,16 +17,9 @@ jobs:
|
||||||
build_and_push_container:
|
build_and_push_container:
|
||||||
runs-on: docker
|
runs-on: docker
|
||||||
container:
|
container:
|
||||||
image: ubuntu-latest
|
image: git.hswro.org/fleg/hswro_org_build:latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
-
|
- uses: actions/download-artifact@v3
|
||||||
name: Login to Docker Hub
|
- run: cd .. && find
|
||||||
uses: docker/login-action@v3
|
- run: cd generated-site && buildah build --file ../docker/serve.Dockerfile -t hswro-org:latest
|
||||||
with:
|
|
||||||
registry: git.hswro.org
|
|
||||||
username: ${{ github.actor }}
|
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
|
||||||
-
|
|
||||||
name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ FROM ubuntu:22.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
ruby-full build-essential zlib1g-dev \
|
ruby-full build-essential zlib1g-dev \
|
||||||
build-essential \
|
build-essential \
|
||||||
git nodejs git podman \
|
git nodejs git buildah \
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& gem install --no-document jekyll -v 4.4.1 \
|
&& gem install --no-document jekyll -v 4.4.1 \
|
||||||
&& gem install --no-document jekyll-environment-variables \
|
&& gem install --no-document jekyll-environment-variables \
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
FROM busybox:1.35
|
FROM busybox:stable
|
||||||
|
|
||||||
# Create a non-root user to own the files and run our server
|
# Create a non-root user to own the files and run our server
|
||||||
RUN adduser -D static
|
RUN adduser -D static
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue