Skip to content

Commit

Permalink
Resolve a merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@nonk123
nonk123 committed Aug 4, 2024
2 parents ed2bf04 + 2175e46 commit bc415a4
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 13 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/permissions.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
- '**/run'
- '**/finish'
- '**/check'
- 'root/migrations/*'

jobs:
permission_check:
uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1
1 change: 1 addition & 0 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ RUN \
iptables-legacy \
ip6tables \
iputils \
kmod \
libcap-utils \
libqrencode-tools \
net-tools \
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.aarch64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ RUN \
iptables-legacy \
ip6tables \
iputils \
kmod \
libcap-utils \
libqrencode-tools \
net-tools \
Expand Down
12 changes: 6 additions & 6 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ pipeline {
-v ${WORKSPACE}:/mnt \
-e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
-e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
apk add --no-cache python3 && \
python3 -m venv /lsiopy && \
pip install --no-cache-dir -U pip && \
Expand Down Expand Up @@ -356,7 +356,7 @@ pipeline {
fi
echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub"
mkdir -p ${TEMPDIR}/docs
git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
git clone --depth=1 https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
cd ${TEMPDIR}/docs/docker-documentation
Expand All @@ -374,8 +374,8 @@ pipeline {
echo "Docs update not needed, skipping"
fi
mkdir -p ${TEMPDIR}/unraid
git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
git clone --depth=1 https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
git clone --depth=1 https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
Expand Down Expand Up @@ -707,7 +707,7 @@ pipeline {
set -e
docker pull ghcr.io/linuxserver/ci:latest
if [ "${MULTIARCH}" == "true" ]; then
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
fi
docker run --rm \
Expand Down Expand Up @@ -798,7 +798,7 @@ pipeline {
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
if [ "${CI}" == "false" ]; then
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
fi
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
Expand Down
11 changes: 11 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,15 @@ Keep in mind that this var will only be considered when the confs are regenerate

Don't forget to set the necessary POSTUP and POSTDOWN rules in your client's peer conf for lan access.

## Read-Only Operation

This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/).

### Caveats
* Not supported in client mode.
* Not supported for the `legacy` tag.


## Usage

To help you get started creating a container from this image you can either use docker-compose or the docker cli.
Expand Down Expand Up @@ -216,6 +225,7 @@ Containers are configured using parameters passed at runtime (such as those abov
| `-v /config` | Contains all relevant configuration files. |
| `-v /lib/modules` | Host kernel modules for situations where they're not already loaded. |
| `--sysctl=` | Required for client mode. |
| `--read-only=true` | Run container with a read-only filesystem. Please [read the docs](https://docs.linuxserver.io/misc/read-only/). |

### Portainer notice

Expand Down Expand Up @@ -382,6 +392,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **23.07.24:** - Install kmod from alpine repository.
* **24.05.24:** - Rebase to Alpine 3.20, install wireguard-tools from Alpine repo.
* **10.03.24:** - Use iptables-legacy on Alpine 3.19.
* **05.03.24:** - Rebase master to Alpine 3.19.
Expand Down
16 changes: 9 additions & 7 deletions package_versions.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ NAME VERSION
alpine-baselayout 3.6.5-r0 apk
alpine-baselayout-data 3.6.5-r0 apk
alpine-keys 2.4-r1 apk
alpine-release 3.20.1-r0 apk
alpine-release 3.20.2-r0 apk
apk-tools 2.14.4-r0 apk
bash 5.2.26-r0 apk
bc 1.07.1-r4 apk
brotli-libs 1.1.0-r2 apk
busybox 1.36.1-r29 apk
busybox-binsh 1.36.1-r29 apk
c-ares 1.28.1-r0 apk
ca-certificates 20240226-r0 apk
ca-certificates-bundle 20240226-r0 apk
ca-certificates 20240705-r0 apk
ca-certificates-bundle 20240705-r0 apk
catatonit 0.2.0-r0 apk
cloud.google.com/go/compute/metadata v0.2.3 go-module
coredns 1.11.1-r9 apk
coreutils 9.5-r1 apk
coreutils-env 9.5-r1 apk
coreutils-fmt 9.5-r1 apk
coreutils-sha512sum 9.5-r1 apk
curl 8.8.0-r0 apk
curl 8.9.0-r0 apk
findutils 4.9.0-r5 apk
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible go-module
github.com/Azure/go-autorest/autorest v0.11.29 go-module
Expand Down Expand Up @@ -149,15 +149,16 @@ k8s.io/client-go v0.27.4
k8s.io/klog/v2 v2.100.1 go-module
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f go-module
k8s.io/utils v0.0.0-20230209194617-a36077c30491 go-module
kmod 32-r0 apk
libacl 2.3.2-r0 apk
libattr 2.5.2-r0 apk
libbsd 0.12.2-r0 apk
libcap-getcap 2.70-r0 apk
libcap-setcap 2.70-r0 apk
libcap-utils 2.70-r0 apk
libcap2 2.70-r0 apk
libcrypto3 3.3.1-r1 apk
libcurl 8.8.0-r0 apk
libcrypto3 3.3.1-r3 apk
libcurl 8.9.0-r0 apk
libelf 0.191-r0 apk
libevent 2.1.12-r7 apk
libidn2 2.3.7-r0 apk
Expand All @@ -173,7 +174,7 @@ libproc2 4.0.4-r0
libpsl 0.21.5-r1 apk
libqrencode 4.1.1-r2 apk
libqrencode-tools 4.1.1-r2 apk
libssl3 3.3.1-r1 apk
libssl3 3.3.1-r3 apk
libunistring 1.2-r0 apk
libxtables 1.8.10-r3 apk
linux-pam 1.6.0-r0 apk
Expand Down Expand Up @@ -204,5 +205,6 @@ utmps-libs 0.1.2.2-r1
wireguard-tools 1.0.20210914-r4 apk
wireguard-tools-wg 1.0.20210914-r4 apk
wireguard-tools-wg-quick 1.0.20210914-r4 apk
xz-libs 5.6.1-r3 apk
zlib 1.3.1-r1 apk
zstd-libs 1.5.6-r0 apk
1 change: 1 addition & 0 deletions readme-vars.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "23.07.24:", desc: "Install kmod from alpine repository." }
- { date: "12.07.24:", desc: "Peer info that is appended to the server config is now templated." }
- { date: "24.05.24:", desc: "Rebase to Alpine 3.20, install wireguard-tools from Alpine repo." }
- { date: "10.03.24:", desc: "Use iptables-legacy on Alpine 3.19." }
Expand Down

0 comments on commit bc415a4

Please sign in to comment.