Compare commits
3 Commits
master
..
53e54e1900
| Author | SHA1 | Date | |
|---|---|---|---|
|
53e54e1900
|
|||
|
301236af94
|
|||
|
899cef5dcd
|
@@ -37,7 +37,6 @@ jobs:
|
|||||||
build-args: |
|
build-args: |
|
||||||
LIBRESSL_VERSION=4.2.1
|
LIBRESSL_VERSION=4.2.1
|
||||||
NGINX_VERSION=1.30.0
|
NGINX_VERSION=1.30.0
|
||||||
NJS_VERSION=0.9.8
|
|
||||||
NGINX_BRANCH=vanilla
|
NGINX_BRANCH=vanilla
|
||||||
-
|
-
|
||||||
name: Build and push nginx custom images
|
name: Build and push nginx custom images
|
||||||
@@ -60,5 +59,4 @@ jobs:
|
|||||||
build-args: |
|
build-args: |
|
||||||
LIBRESSL_VERSION=4.2.1
|
LIBRESSL_VERSION=4.2.1
|
||||||
NGINX_VERSION=1.30.0
|
NGINX_VERSION=1.30.0
|
||||||
NJS_VERSION=0.9.8
|
|
||||||
NGINX_BRANCH=woggioni
|
NGINX_BRANCH=woggioni
|
||||||
|
|||||||
@@ -24,12 +24,12 @@ jobs:
|
|||||||
builder: multiplatform-builder
|
builder: multiplatform-builder
|
||||||
context: "{{defaultContext}}:opencode"
|
context: "{{defaultContext}}:opencode"
|
||||||
build-args: |
|
build-args: |
|
||||||
OPENCODE_VERSION=1.15.3
|
OPENCODE_VERSION=1.14.48
|
||||||
platforms: |
|
platforms: |
|
||||||
linux/amd64
|
linux/amd64
|
||||||
push: true
|
push: true
|
||||||
pull: true
|
pull: true
|
||||||
tags: |
|
tags: |
|
||||||
"gitea.woggioni.net/woggioni/opencode:1.15.3"
|
"gitea.woggioni.net/woggioni/opencode:1.14.48"
|
||||||
"gitea.woggioni.net/woggioni/opencode:latest"
|
"gitea.woggioni.net/woggioni/opencode:latest"
|
||||||
|
|
||||||
|
|||||||
@@ -29,5 +29,6 @@ jobs:
|
|||||||
pull: false
|
pull: false
|
||||||
ssh: default=/home/luser/.ssh/id_ed25519
|
ssh: default=/home/luser/.ssh/id_ed25519
|
||||||
tags: |
|
tags: |
|
||||||
"gitea.woggioni.net/woggioni/sserver-rust:dev"
|
"gitea.woggioni.net/woggioni/sserver-rust:latest"
|
||||||
|
"gitea.woggioni.net/woggioni/sserver-rust:v1.24.0"
|
||||||
build-args: "VERSION=1.24.0"
|
build-args: "VERSION=1.24.0"
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ RUN rm repository.key
|
|||||||
RUN --mount=type=cache,target=/var/cache/pacman pacman -Syu --noconfirm
|
RUN --mount=type=cache,target=/var/cache/pacman pacman -Syu --noconfirm
|
||||||
RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
|
RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
|
||||||
curl \
|
curl \
|
||||||
openssh \
|
|
||||||
aarch64-unknown-linux-musl-gcc x86_64-unknown-linux-musl-gcc \
|
aarch64-unknown-linux-musl-gcc x86_64-unknown-linux-musl-gcc \
|
||||||
arm-unknown-linux-musleabihf-gcc \
|
arm-unknown-linux-musleabihf-gcc \
|
||||||
arm-unknown-linux-musleabi-gcc \
|
arm-unknown-linux-musleabi-gcc \
|
||||||
@@ -71,6 +70,7 @@ RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
|
|||||||
imagemagick \
|
imagemagick \
|
||||||
python-sphinx \
|
python-sphinx \
|
||||||
python-yaml \
|
python-yaml \
|
||||||
|
openssh \
|
||||||
rust \
|
rust \
|
||||||
rust-src \
|
rust-src \
|
||||||
rust-bindgen \
|
rust-bindgen \
|
||||||
|
|||||||
+4
-3
@@ -2,7 +2,7 @@ ARG NGINX_BRANCH=vanilla
|
|||||||
FROM alpine:3.23 AS base
|
FROM alpine:3.23 AS base
|
||||||
|
|
||||||
FROM base AS build_stage_1
|
FROM base AS build_stage_1
|
||||||
ARG NGINX_VERSION LIBRESSL_VERSION NJS_VERSION
|
ARG NGINX_VERSION LIBRESSL_VERSION
|
||||||
RUN --mount=type=cache,target=/var/cache/apk apk update
|
RUN --mount=type=cache,target=/var/cache/apk apk update
|
||||||
RUN --mount=type=cache,target=/var/cache/apk apk add \
|
RUN --mount=type=cache,target=/var/cache/apk apk add \
|
||||||
autoconf \
|
autoconf \
|
||||||
@@ -34,7 +34,8 @@ RUN --mount=type=cache,target=/var/cache/apk apk add \
|
|||||||
tar \
|
tar \
|
||||||
tzdata \
|
tzdata \
|
||||||
zlib \
|
zlib \
|
||||||
zlib-dev
|
zlib-dev \
|
||||||
|
mercurial
|
||||||
RUN adduser -D luser
|
RUN adduser -D luser
|
||||||
USER luser
|
USER luser
|
||||||
WORKDIR /home/luser
|
WORKDIR /home/luser
|
||||||
@@ -68,7 +69,7 @@ ADD --chown=luser:luser https://github.com/google/ngx_brotli.git /ngx_brotli
|
|||||||
|
|
||||||
USER root
|
USER root
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
ADD --chown=luser:luser git@github.com:nginx/njs.git#${NJS_VERSION} /njs
|
RUN hg clone http://hg.nginx.org/njs /njs
|
||||||
RUN chown luser:luser -R /njs
|
RUN chown luser:luser -R /njs
|
||||||
USER luser
|
USER luser
|
||||||
WORKDIR /home/luser
|
WORKDIR /home/luser
|
||||||
|
|||||||
Reference in New Issue
Block a user