Skip to content

Commit 2db5aa4

Browse files
andyoneandyone
authored
Merge pull request #161 from essentialkaos/develop
Version 1.28.1
2 parents 439d754 + d5e4e20 commit 2db5aa4

File tree

12 files changed

+216
-95
lines changed

12 files changed

+216
-95
lines changed

‎.docker/ol10-unprivileged.docker‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
## REGISTRY CONFIGURATION ######################################################
2+
3+
ARG REGISTRY="docker.io"
4+
5+
## WEBKAOS UNPRIVILEGED IMAGE ##################################################
6+
7+
FROM ${REGISTRY}/essentialkaos/oraclelinux:10-slim
8+
9+
LABEL org.opencontainers.image.title="WEBKAOS (Unprivileged)" \
10+
org.opencontainers.image.description="WEBKAOS Image on OracleLinux 10" \
11+
org.opencontainers.image.vendor="ESSENTIAL KAOS" \
12+
org.opencontainers.image.authors="Anton Novojilov" \
13+
org.opencontainers.image.licenses="Apache-2.0" \
14+
org.opencontainers.image.url="https://kaos.sh/webkaos" \
15+
org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"
16+
17+
ARG WEBKAOS_VER=1.28.1
18+
ARG REPOSITORY=kaos-release
19+
20+
ARG UID=1001
21+
ARG GID=1001
22+
23+
# hadolint ignore=DL3031,DL3041
24+
RUN rpm -ivh https://pkgs.kaos.st/kaos-repo-latest.el10.noarch.rpm && \
25+
microdnf -y install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} gettext && \
26+
microdnf clean all && \
27+
rm -rf /var/cache/dnf /var/log/dnf.* && \
28+
rm -rf /tmp/* && \
29+
rm -rf /var/tmp/* && \
30+
usermod -u $UID webkaos && \
31+
groupmod -g $GID webkaos && \
32+
mkdir /var/run/webkaos && \
33+
chown -R $UID:$GID /etc/webkaos /var/run/webkaos /var/log/webkaos && \
34+
ln -sf /dev/stdout /var/log/webkaos/access.log && \
35+
ln -sf /dev/stderr /var/log/webkaos/error.log && \
36+
mkdir /etc/webkaos/templates
37+
38+
COPY --chown=$UID:$GID SOURCES/webkaos-docker-unprivileged.conf /etc/webkaos/webkaos.conf
39+
COPY .docker/entrypoint.sh /
40+
41+
ENTRYPOINT ["/entrypoint.sh"]
42+
43+
EXPOSE 8080
44+
45+
USER $UID
46+
47+
STOPSIGNAL SIGTERM
48+
49+
CMD ["webkaos", "-g", "daemon off;"]
50+
51+
################################################################################

‎.docker/ol10.docker‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
## REGISTRY CONFIGURATION ######################################################
2+
3+
ARG REGISTRY="docker.io"
4+
5+
## WEBKAOS IMAGE ###############################################################
6+
7+
FROM ${REGISTRY}/essentialkaos/oraclelinux:10-slim
8+
9+
LABEL org.opencontainers.image.title="WEBKAOS" \
10+
org.opencontainers.image.description="WEBKAOS Image on OracleLinux 10" \
11+
org.opencontainers.image.vendor="ESSENTIAL KAOS" \
12+
org.opencontainers.image.authors="Anton Novojilov" \
13+
org.opencontainers.image.licenses="Apache-2.0" \
14+
org.opencontainers.image.url="https://kaos.sh/webkaos" \
15+
org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"
16+
17+
ARG WEBKAOS_VER=1.28.1
18+
ARG REPOSITORY=kaos-release
19+
20+
# hadolint ignore=DL3031,DL3041
21+
RUN rpm -ivh https://pkgs.kaos.st/kaos-repo-latest.el10.noarch.rpm && \
22+
microdnf -y install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} gettext && \
23+
microdnf clean all && \
24+
rm -rf /var/cache/dnf /var/log/dnf.* && \
25+
rm -rf /tmp/* && \
26+
rm -rf /var/tmp/* && \
27+
ln -sf /dev/stdout /var/log/webkaos/access.log && \
28+
ln -sf /dev/stderr /var/log/webkaos/error.log && \
29+
mkdir /etc/webkaos/templates
30+
31+
COPY SOURCES/webkaos-docker.conf /etc/webkaos/webkaos.conf
32+
COPY .docker/entrypoint.sh /
33+
34+
ENTRYPOINT ["/entrypoint.sh"]
35+
36+
EXPOSE 80
37+
38+
STOPSIGNAL SIGTERM
39+
40+
CMD ["webkaos", "-g", "daemon off;"]
41+
42+
################################################################################

‎.docker/ol8-unprivileged.docker‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title="WEBKAOS (Unprivileged)" \
1414
org.opencontainers.image.url="https://kaos.sh/webkaos" \
1515
org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"
1616

17-
ARG WEBKAOS_VER=1.28.0
17+
ARG WEBKAOS_VER=1.28.1
1818
ARG REPOSITORY=kaos-release
1919

2020
ARG UID=1001

‎.docker/ol8.docker‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title="WEBKAOS" \
1414
org.opencontainers.image.url="https://kaos.sh/webkaos" \
1515
org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"
1616

17-
ARG WEBKAOS_VER=1.28.0
17+
ARG WEBKAOS_VER=1.28.1
1818
ARG REPOSITORY=kaos-release
1919

2020
# hadolint ignore=DL3031,DL3041

‎.docker/ol9-unprivileged.docker‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title="WEBKAOS (Unprivileged)" \
1414
org.opencontainers.image.url="https://kaos.sh/webkaos" \
1515
org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"
1616

17-
ARG WEBKAOS_VER=1.28.0
17+
ARG WEBKAOS_VER=1.28.1
1818
ARG REPOSITORY=kaos-release
1919

2020
ARG UID=1001

‎.docker/ol9.docker‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title="WEBKAOS" \
1414
org.opencontainers.image.url="https://kaos.sh/webkaos" \
1515
org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"
1616

17-
ARG WEBKAOS_VER=1.28.0
17+
ARG WEBKAOS_VER=1.28.1
1818
ARG REPOSITORY=kaos-release
1919

2020
# hadolint ignore=DL3031,DL3041

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Code checkout
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v6
2121

2222
- name: Login to DockerHub
2323
uses: docker/login-action@v3
@@ -37,7 +37,7 @@ jobs:
3737

3838
steps:
3939
- name: Checkout
40-
uses: actions/checkout@v4
40+
uses: actions/checkout@v6
4141

4242
- name: Check scripts with Shellcheck
4343
uses: essentialkaos/shellcheck-action@v1
@@ -50,7 +50,7 @@ jobs:
5050

5151
steps:
5252
- name: Checkout
53-
uses: actions/checkout@v4
53+
uses: actions/checkout@v6
5454

5555
- name: Check dockerfiles with Hadolint
5656
uses: essentialkaos/hadolint-action@v1
@@ -63,7 +63,7 @@ jobs:
6363

6464
steps:
6565
- name: Checkout source code
66-
uses: actions/checkout@v4
66+
uses: actions/checkout@v6
6767

6868
- name: Test recipes with Bibop
6969
uses: essentialkaos/bibop-action@v1
@@ -77,7 +77,7 @@ jobs:
7777

7878
steps:
7979
- name: Checkout source code
80-
uses: actions/checkout@v4
80+
uses: actions/checkout@v6
8181

8282
- name: Run entrypoint unit tests
8383
run: .docker/version_check.sh
@@ -93,7 +93,7 @@ jobs:
9393

9494
strategy:
9595
matrix:
96-
image: [ 'ol8', 'ol8-unprivileged', 'ol9', 'ol9-unprivileged' ]
96+
image: [ 'ol8', 'ol8-unprivileged', 'ol9', 'ol9-unprivileged', 'ol10', 'ol10-unprivileged' ]
9797

9898
steps:
9999
- name: Check event type
@@ -106,7 +106,7 @@ jobs:
106106
# More info about issue: https://github.com/actions/runner/issues/491
107107
108108
- name: Checkout
109-
uses: actions/checkout@v4
109+
uses: actions/checkout@v6
110110
if: ${{ github.event_name == 'pull_request' }}
111111

112112
- name: Check versions in Dockerfiles

‎.github/workflows/docker-push.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ jobs:
2828

2929
strategy:
3030
matrix:
31-
image: [ 'ol8', 'ol8-unprivileged', 'ol9', 'ol9-unprivileged' ]
31+
image: [ 'ol8', 'ol8-unprivileged', 'ol9', 'ol9-unprivileged', 'ol10', 'ol10-unprivileged' ]
3232

3333
steps:
3434
- name: Checkout
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v6
3636
with:
3737
fetch-depth: 0
3838

‎README.md‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
### Installation
2323

24-
#### From ESSENTIAL KAOS Public repository (EL 8/9)
24+
#### From ESSENTIAL KAOS Public repository (EL 8/9/10)
2525

2626
```bash
2727
sudo dnf install -y https://pkgs.kaos.st/kaos-repo-latest.el$(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5).noarch.rpm
@@ -38,21 +38,25 @@ Official images:
3838
- `ghcr.io/essentialkaos/webkaos:ol8-unprivileged`
3939
- `ghcr.io/essentialkaos/webkaos:ol9`
4040
- `ghcr.io/essentialkaos/webkaos:ol9-unprivileged`
41+
- `ghcr.io/essentialkaos/webkaos:ol10`
42+
- `ghcr.io/essentialkaos/webkaos:ol10-unprivileged`
4143
- `essentialkaos/webkaos:ol8`
4244
- `essentialkaos/webkaos:ol8-unprivileged`
4345
- `essentialkaos/webkaos:ol9`
4446
- `essentialkaos/webkaos:ol9-unprivileged`
47+
- `essentialkaos/webkaos:ol10`
48+
- `essentialkaos/webkaos:ol10-unprivileged`
4549

4650
Usage examples:
4751

4852
```bash
49-
# Image on OracleLinux 8
50-
docker run --name my-webkaos -v /some/content:/usr/share/webkaos/html:ro -p 8080:80 -d essentialkaos/webkaos:ol8
53+
# Image on OracleLinux 9
54+
docker run --name my-webkaos -v /some/content:/usr/share/webkaos/html:ro -p 8080:80 -d essentialkaos/webkaos:ol9
5155
```
5256

5357
```bash
54-
# Unprivileged image on OracleLinux 8
55-
docker run --name my-webkaos -v /some/content:/usr/share/webkaos/html:ro -p 8080:8080 -d essentialkaos/webkaos:ol8-unprivileged
58+
# Unprivileged image on OracleLinux 9
59+
docker run --name my-webkaos -v /some/content:/usr/share/webkaos/html:ro -p 8080:8080 -d essentialkaos/webkaos:ol9-unprivileged
5660
```
5761

5862
Useful environment variables:
@@ -69,7 +73,7 @@ Useful environment variables:
6973
git clone https://kaos.sh/webkaos
7074
cd webkaos/
7175
rpmbuilder webkaos.spec -dl SOURCES
72-
rpmbuilder webkaos.spec -3 -V -I
76+
rpmbuilder webkaos.spec -V -I
7377
```
7478

7579
### FAQ

‎SOURCES/bots.conf‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,18 @@
88
map $http_user_agent $is_scanbot {
99
default 0;
1010
~*(google|bing|yandex|msnbot) 1;
11-
~*(AltaVista|Googlebot|Slurp|BlackWidow|Bot|ChinaClaw|Custo|DISCo|Download|Demon|eCatch|EirGrabber|EmailSiphon|EmailWolf|SuperHTTP|Surfbot|WebWhacker) 1;
12-
~*(Express|WebPictures|ExtractorPro|EyeNetIE|FlashGet|GetRight|GetWeb!|Go!Zilla|Go-Ahead-Got-It|GrabNet|Grafula|HMView|Go!Zilla|Go-Ahead-Got-It) 1;
13-
~*(rafula|HMView|HTTrack|Stripper|Sucker|Indy|InterGET|Ninja|JetCar|Spider|larbin|LeechFTP|Downloader|tool|Navroad|NearSite|NetAnts|tAkeOut|WWWOFFLE) 1;
14-
~*(GrabNet|NetSpider|Vampire|NetZIP|Octopus|Offline|PageGrabber|Foto|pavuk|pcBrowser|RealDownload|ReGet|SiteSnagger|SmartDownload|SuperBot|WebSpider) 1;
15-
~*(Teleport|VoidEYE|Collector|WebAuto|WebCopier|WebFetch|WebGo|WebLeacher|WebReaper|WebSauger|eXtractor|Quester|WebStripper|WebZIP|Widow|Zeus) 1;
16-
~*(Twengabot|htmlparser|scan|email|Pyth|PyQ|WebCollector|WebCopy|webcraw|DotBot|ClaudeBot|facebookexternalhit|meta-externalagent|Barkrowler) 1;
11+
~*(AltaVista|Googlebot|Slurp|BlackWidow|Bot|ChinaClaw|Custo|DISCo) 1;
12+
~*(Demon|eCatch|EirGrabber|EmailSiphon|EmailWolf|SuperHTTP|Surfbot) 1;
13+
~*(Express|WebPictures|ExtractorPro|EyeNetIE|FlashGet|GetRight|GetWeb!) 1;
14+
~*(Go!Zilla|Go-Ahead-Got-It|GrabNet|Grafula|HMView|Go!Zilla) 1;
15+
~*(rafula|HMView|HTTrack|Stripper|Sucker|Indy|InterGET|Ninja|JetCar) 1;
16+
~*(Spider|larbin|LeechFTP|Downloader|tool|Navroad|NearSite|NetAnts) 1;
17+
~*(GrabNet|NetSpider|Vampire|NetZIP|Octopus|Offline|PageGrabber) 1;
18+
~*(Foto|pavuk|pcBrowser|RealDownload|ReGet|SiteSnagger|SmartDownload) 1;
19+
~*(Teleport|VoidEYE|Collector|WebAuto|WebCopier|WebFetch|WebGo) 1;
20+
~*(WebLeacher|WebReaper|WebSauger|eXtractor|Quester|WebStripper) 1;
21+
~*(Twengabot|htmlparser|scan|email|Pyth|PyQ|WebCollector|WebCopy) 1;
22+
~*(webcraw|DotBot|ClaudeBot|facebookexternalhit|meta-externalagent) 1;
23+
~*(WebZIP|Widow|Zeus|GPTBot|Barkrowler|SuperBot|WebSpider|tAkeOut) 1;
24+
~*(WWWOFFLE|Go-Ahead-Got-It|WebWhacker|Download) 1;
1725
}

0 commit comments

Comments
 (0)