Skip to content

Commit a4b7bd5

Browse files
committed
update edge repo, remove stream.conf
1 parent 85b21e4 commit a4b7bd5

File tree

10 files changed

+75
-91
lines changed

10 files changed

+75
-91
lines changed

.github/ISSUE_TEMPLATE/issue.bug.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ body:
6767
- type: textarea
6868
attributes:
6969
description: |
70-
Provide a full docker log, output of "docker logs linuxserver.io"
70+
Provide a full docker log, output of "docker logs nginx"
7171
label: Container logs
7272
placeholder: |
73-
Output of `docker logs linuxserver.io`
73+
Output of `docker logs nginx`
7474
render: bash
7575
validations:
7676
required: true

.github/workflows/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
external-trigger-master:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3.1.0
10+
- uses: actions/checkout@v4.1.1
1111

1212
- name: External Trigger
1313
if: github.ref == 'refs/heads/master'

.github/workflows/external_trigger_scheduler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
external-trigger-scheduler:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3.1.0
12+
- uses: actions/checkout@v4.1.1
1313
with:
1414
fetch-depth: '0'
1515

.github/workflows/package_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
package-trigger-master:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3.1.0
10+
- uses: actions/checkout@v4.1.1
1111

1212
- name: Package Trigger
1313
if: github.ref == 'refs/heads/master'

.github/workflows/package_trigger_scheduler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
package-trigger-scheduler:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3.1.0
12+
- uses: actions/checkout@v4.1.1
1313
with:
1414
fetch-depth: '0'
1515

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG BUILD_DATE
77
ARG VERSION
88
ARG NGINX_VERSION
99
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
10-
LABEL maintainer="aptalca"
10+
LABEL maintainer="nemchik"
1111

1212

1313
# install packages
@@ -68,8 +68,9 @@ RUN \
6868
php83-tokenizer \
6969
php83-xmlreader \
7070
php83-xsl && \
71-
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
72-
php83-pecl-mcrypt
71+
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
72+
php83-pecl-mcrypt && \
73+
rm -f /etc/nginx/conf.d/stream.conf
7374

7475
# ports and volumes
7576
EXPOSE 80 443

Dockerfile.aarch64

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG BUILD_DATE
77
ARG VERSION
88
ARG NGINX_VERSION
99
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
10-
LABEL maintainer="aptalca"
10+
LABEL maintainer="nemchik"
1111

1212

1313
# install packages
@@ -68,8 +68,9 @@ RUN \
6868
php83-tokenizer \
6969
php83-xmlreader \
7070
php83-xsl && \
71-
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
72-
php83-pecl-mcrypt
71+
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
72+
php83-pecl-mcrypt && \
73+
rm -f /etc/nginx/conf.d/stream.conf
7374

7475
# ports and volumes
7576
EXPOSE 80 443

Jenkinsfile

Lines changed: 58 additions & 60 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ To help you get started creating a container from this image you can either use
7171

7272
```yaml
7373
---
74-
version: "2.1"
7574
services:
7675
nginx:
7776
image: lscr.io/linuxserver/nginx:latest
@@ -185,7 +184,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
185184

186185
## Updating Info
187186

188-
Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
187+
Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
189188

190189
Below are the instructions for updating containers:
191190

@@ -250,21 +249,6 @@ Below are the instructions for updating containers:
250249
docker image prune
251250
```
252251

253-
### Via Watchtower auto-updater (only use if you don't remember the original parameters)
254-
255-
* Pull the latest image at its tag and replace it with the same env variables in one run:
256-
257-
```bash
258-
docker run --rm \
259-
-v /var/run/docker.sock:/var/run/docker.sock \
260-
containrrr/watchtower \
261-
--run-once nginx
262-
```
263-
264-
* You can also remove the old dangling images: `docker image prune`
265-
266-
**warning**: We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
267-
268252
### Image Update Notifications - Diun (Docker Image Update Notifier)
269253

270254
**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
@@ -292,7 +276,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
292276

293277
## Versions
294278

295-
* **23.12.23:** - Rebase to Alpine 3.19 with php 8.3.
279+
* **05.03.24:** - Rebase to Alpine 3.19 with php 8.3.
296280
* **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
297281
* **16.01.23:** - Remove nchan module because it keeps causing crashes.
298282
* **22.12.22:** - Rebase to Alpine 3.17 with PHP 8.1, migrate to s6v3.

readme-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ app_setup_block: |
3939
4040
# changelog
4141
changelogs:
42-
- { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}
42+
- { date: "05.03.24:", desc: "Rebase to Alpine 3.19 with php 8.3."}
4343
- { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
4444
- { date: "16.01.23:", desc: "Remove nchan module because it keeps causing crashes." }
4545
- { date: "22.12.22:", desc: "Rebase to Alpine 3.17 with PHP 8.1, migrate to s6v3." }

0 commit comments

Comments
 (0)