Compare commits
1 commit
master
...
feature/wo
Author | SHA1 | Date | |
---|---|---|---|
6e50039ade |
5 changed files with 8 additions and 22 deletions
|
@ -2,6 +2,12 @@ on:
|
|||
push:
|
||||
pull_request:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
image:
|
||||
description: Which image to build
|
||||
default: none
|
||||
required: false
|
||||
type: string
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
@ -38,7 +44,7 @@ jobs:
|
|||
run: make push-${{matrix.tag}}
|
||||
if: >-
|
||||
github.ref == 'refs/heads/master' &&
|
||||
(github.event_name == 'workflow_dispatch' ||
|
||||
((github.event_name == 'workflow_dispatch' && github.event.inputs.image == matrix.tag) ||
|
||||
(steps.changed.outputs.any_changed == 'true' && github.event_name == 'push'))
|
||||
env:
|
||||
REGISTRY_PASSWORD: ${{secrets.FORGEJO_OCI_REGISTRY_PUSH_TOKEN}}
|
||||
|
|
|
@ -2,7 +2,3 @@ FROM docker.io/node:20-bookworm-slim as node
|
|||
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
|
||||
COPY --from=node /usr/local /usr/local
|
||||
COPY --from=node /opt /opt
|
||||
RUN apt-get update && \
|
||||
apt-get install -y --no-install-recommends \
|
||||
make && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
|
|
@ -10,15 +10,10 @@ RUN apt-get update && \
|
|||
ln -s /usr/bin/podman /usr/local/bin/docker && \
|
||||
echo root:10000:1000 > /etc/subuid && \
|
||||
echo root:10000:1000 > /etc/subgid && \
|
||||
echo '#!/bin/bash\npodman system service -t 0 unix:///tmp/podman-service.socket &\ndisown' > /usr/local/bin/podman-service.sh && \
|
||||
echo -e '#!/bin/bash\npodman system service -t 0 unix:///var/run/docker.sock &\ndisown' > /usr/local/bin/podman-service.sh && \
|
||||
chmod +x /usr/local/bin/podman-service.sh
|
||||
|
||||
# Configuration for podman inside rootless podman
|
||||
COPY containers.conf /etc/containers/containers.conf
|
||||
COPY registries.conf /etc/containers/registries.conf
|
||||
COPY storage.conf /etc/containers/storage.conf
|
||||
|
||||
# Configuration for testcontainers
|
||||
ENV DOCKER_HOST=unix:///tmp/podman-service.socket
|
||||
ENV TESTCONTAINERS_DOCKER_SOCKER_OVERRIDE=/tmp/podman-service.socket
|
||||
ENV TESTCONTAINERS_RYUK_DISABLED=true
|
||||
|
|
|
@ -2,4 +2,3 @@ FROM docker.io/node:20-bullseye-slim as node
|
|||
FROM docker.io/maven:3.8.6-openjdk-11
|
||||
COPY --from=node /usr/local /usr/local
|
||||
COPY --from=node /opt /opt
|
||||
COPY settings.xml /root/.m2/settings.xml
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
<!-- https://forgejo.org/docs/latest/user/packages/maven/ -->
|
||||
<settings>
|
||||
<servers>
|
||||
<server>
|
||||
<id>${env.MAVEN_REGISTRY}</id>
|
||||
<username>${env.MAVEN_REGISTRY_USER}</username>
|
||||
<password>${env.MAVEN_REGISTRY_PASSWORD}</password>
|
||||
</server>
|
||||
</servers>
|
||||
</settings>
|
Loading…
Add table
Reference in a new issue