Skip to content

Commit 9df6c8a

Browse files
author
Kendar
committed
Ver 4.2.1
1 parent a301e72 commit 9df6c8a

File tree

64 files changed

+1980
-1980
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1980
-1980
lines changed

‎docker/images/apache-php8/Dockerfile‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
FROM ham.apache
2-
3-
RUN echo ham.apache-php8 version-4.2.0
4-
5-
# Setup apache and php
6-
RUN apk add --no-cache \
7-
php8-apache2 \
8-
php8-bcmath \
9-
php8-bz2 \
10-
php8-calendar \
11-
php8-common \
12-
php8-ctype \
13-
php8-curl \
14-
php8-dom \
15-
php8-gd \
16-
php8-iconv \
17-
php8-mbstring \
18-
php8-mysqli \
19-
php8-mysqlnd \
20-
php8-openssl \
21-
php8-pdo_mysql \
22-
php8-pdo_pgsql \
23-
php8-pdo_sqlite \
24-
php8-phar \
25-
php8-session \
26-
php8-xml \
27-
php8-pear \
28-
php8-xdebug --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
29-
&& mkdir -p docker/php/conf.d
30-
31-
# WAS ON --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing
32-
33-
RUN pear8 config-set php_ini /etc/php8/php.ini
34-
35-
COPY config/setupphp8.sh /etc/setupphp8.sh
36-
COPY config/error_reporting.ini /etc/php8/conf.d/error_reporting.ini
37-
38-
RUN chmod +x /etc/*.sh \
39-
&& /etc/setupphp8.sh
40-
1+
FROM ham.apache
2+
3+
RUN echo ham.apache-php8 version-4.2.1
4+
5+
# Setup apache and php
6+
RUN apk add --no-cache \
7+
php8-apache2 \
8+
php8-bcmath \
9+
php8-bz2 \
10+
php8-calendar \
11+
php8-common \
12+
php8-ctype \
13+
php8-curl \
14+
php8-dom \
15+
php8-gd \
16+
php8-iconv \
17+
php8-mbstring \
18+
php8-mysqli \
19+
php8-mysqlnd \
20+
php8-openssl \
21+
php8-pdo_mysql \
22+
php8-pdo_pgsql \
23+
php8-pdo_sqlite \
24+
php8-phar \
25+
php8-session \
26+
php8-xml \
27+
php8-pear \
28+
php8-xdebug --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
29+
&& mkdir -p docker/php/conf.d
30+
31+
# WAS ON --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing
32+
33+
RUN pear8 config-set php_ini /etc/php8/php.ini
34+
35+
COPY config/setupphp8.sh /etc/setupphp8.sh
36+
COPY config/error_reporting.ini /etc/php8/conf.d/error_reporting.ini
37+
38+
RUN chmod +x /etc/*.sh \
39+
&& /etc/setupphp8.sh
40+

‎docker/images/apache/Dockerfile‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
FROM ham.client
2-
3-
RUN echo ham.apache version-4.2.0
4-
5-
# Setup apache and php
6-
RUN apk --no-cache add apache2 apache2-ssl curl \
7-
&& mkdir /htdocs
8-
9-
COPY config/startapache.sh /etc/startapache.sh
10-
COPY config/setupapache.sh /etc/setupapache.sh
11-
12-
RUN chmod +x /etc/*.sh \
13-
&& /etc/setupapache.sh \
1+
FROM ham.client
2+
3+
RUN echo ham.apache version-4.2.1
4+
5+
# Setup apache and php
6+
RUN apk --no-cache add apache2 apache2-ssl curl \
7+
&& mkdir /htdocs
8+
9+
COPY config/startapache.sh /etc/startapache.sh
10+
COPY config/setupapache.sh /etc/setupapache.sh
11+
12+
RUN chmod +x /etc/*.sh \
13+
&& /etc/setupapache.sh \
1414
&& /etc/startservice.sh --app=apache --run=/etc/startapache.sh

‎docker/images/base/Dockerfile‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
FROM alpine:latest
2-
RUN apk update
3-
RUN apk upgrade
4-
5-
RUN echo ham.base version-4.2.0
6-
7-
ENV JAVA11_HOME /usr/lib/jvm/java-11-openjdk
8-
9-
# Add needed packages
10-
RUN apk add --no-cache bash openssl ca-certificates openjdk11 runit openssh \
11-
&& rm -rf $JAVA11_HOME/demo \
12-
&& rm -rf $JAVA11_HOME/jmods \
13-
&& rm -rf $JAVA11_HOME/include \
14-
&& rm -rf $JAVA11_HOME/man
15-
16-
17-
18-
19-
RUN mkdir -p /etc/ssh
20-
# Load certificates
21-
COPY data/ca.crt /usr/local/share/ca-certificates/
22-
COPY data/sshd_config /etc/ssh/
23-
COPY data/startservice.sh /etc/startservice.sh
24-
COPY data/basesetup.sh /etc/basesetup.sh
25-
COPY data/DoSleep.java /etc/DoSleep.java
26-
27-
# Prepare certificates, runit space, generate ssh keys, setup ssh service, force root password
28-
RUN chmod 777 /etc/basesetup.sh
29-
RUN /etc/basesetup.sh
30-
31-
# Start everything
32-
CMD ["runsvdir", "/etc/service"]
33-
1+
FROM alpine:latest
2+
RUN apk update
3+
RUN apk upgrade
4+
5+
RUN echo ham.base version-4.2.1
6+
7+
ENV JAVA11_HOME /usr/lib/jvm/java-11-openjdk
8+
9+
# Add needed packages
10+
RUN apk add --no-cache bash openssl ca-certificates openjdk11 runit openssh \
11+
&& rm -rf $JAVA11_HOME/demo \
12+
&& rm -rf $JAVA11_HOME/jmods \
13+
&& rm -rf $JAVA11_HOME/include \
14+
&& rm -rf $JAVA11_HOME/man
15+
16+
17+
18+
19+
RUN mkdir -p /etc/ssh
20+
# Load certificates
21+
COPY data/ca.crt /usr/local/share/ca-certificates/
22+
COPY data/sshd_config /etc/ssh/
23+
COPY data/startservice.sh /etc/startservice.sh
24+
COPY data/basesetup.sh /etc/basesetup.sh
25+
COPY data/DoSleep.java /etc/DoSleep.java
26+
27+
# Prepare certificates, runit space, generate ssh keys, setup ssh service, force root password
28+
RUN chmod 777 /etc/basesetup.sh
29+
RUN /etc/basesetup.sh
30+
31+
# Start everything
32+
CMD ["runsvdir", "/etc/service"]
33+

‎docker/images/client/Dockerfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM ham.base
2-
3-
RUN echo ham.client version-4.2.0
4-
5-
# Setup localdns
6-
RUN mkdir -p /etc/app/simpledns/
7-
COPY data/*.* /etc/app/simpledns/
8-
COPY data/clientsetup.sh /etc/clientsetup.sh
9-
RUN chmod +x /etc/*.sh \
1+
FROM ham.base
2+
3+
RUN echo ham.client version-4.2.1
4+
5+
# Setup localdns
6+
RUN mkdir -p /etc/app/simpledns/
7+
COPY data/*.* /etc/app/simpledns/
8+
COPY data/clientsetup.sh /etc/clientsetup.sh
9+
RUN chmod +x /etc/*.sh \
1010
&& /etc/clientsetup.sh

‎docker/images/externalvpn/forticlient/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ RUN \
3131
#docker run --privileged --cap-add SYS_ADMIN --cap-add DAC_READ_SEARCH --name myvpn myvpn
3232
FROM ham.base:latest
3333

34-
RUN echo ham.openforti version-4.2.0
34+
RUN echo ham.openforti version-4.2.1
3535

3636
COPY --from=builder /usr/bin/openfortivpn /usr/bin/
3737
#/go/bin/glider

‎docker/images/externalvpn/openconnect/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM ubuntu:latest
44
RUN apt-get update
55
RUN apt-get upgrade -y
66

7-
RUN echo ham.openconnect version-4.2.0
7+
RUN echo ham.openconnect version-4.2.1
88

99
# Block timezone request prompt
1010
ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/Rome"

‎docker/images/master/Dockerfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM ham.base
2-
3-
RUN echo ham.master version-4.2.0
4-
5-
COPY data/ham.sh /etc/app/ham/
6-
COPY data/app /etc/app/ham/app/
7-
RUN chmod +x /etc/app/ham/*.sh
8-
9-
10-
# Start HAM service
11-
RUN /etc/startservice.sh --app=ham --run=/etc/app/ham/ham.sh
1+
FROM ham.base
2+
3+
RUN echo ham.master version-4.2.1
4+
5+
COPY data/ham.sh /etc/app/ham/
6+
COPY data/app /etc/app/ham/app/
7+
RUN chmod +x /etc/app/ham/*.sh
8+
9+
10+
# Start HAM service
11+
RUN /etc/startservice.sh --app=ham --run=/etc/app/ham/ham.sh

‎docker/images/mysql/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ham.client
22

3-
RUN echo ham.mysql version-4.2.0
3+
RUN echo ham.mysql version-4.2.1
44

55
ENV TIMEZONE=Europe/Paris
66
ENV MYSQL_ROOT_PASSWORD=root

‎docker/images/openvpn/Dockerfile‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
FROM ham.base
2-
3-
4-
RUN echo ham.openvpn version-4.2.0
5-
6-
# Testing: pamtester
7-
RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories && \
8-
apk add --update openvpn iptables bash easy-rsa openvpn-auth-pam google-authenticator pamtester libqrencode && \
9-
ln -s /usr/share/easy-rsa/easyrsa /usr/local/bin && \
10-
rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/*
11-
12-
# Needed by scripts
13-
ENV OPENVPN=/etc/openvpn
14-
ENV EASYRSA=/usr/share/easy-rsa \
15-
EASYRSA_CRL_DAYS=3650 \
16-
EASYRSA_PKI=$OPENVPN/pki
17-
18-
#VOLUME ["/etc/openvpn"]
19-
20-
# Internally uses port 1194/udp, remap using `docker run -p 443:1194/tcp`
21-
EXPOSE 1194/udp
22-
23-
ADD data/bin /usr/local/bin
24-
ADD data/etc /etc
25-
RUN chmod a+x /usr/local/bin/*
26-
27-
# Add support for OTP authentication using a PAM module
28-
ADD data/otp/openvpn /etc/pam.d/
29-
30-
RUN mkdir -p /etc/app/openvpn
31-
COPY data/openvpn.sh /etc/app/openvpn
32-
RUN chmod +x /etc/app/openvpn/*.sh
33-
COPY data/openvpn.conf /etc/openvpn
34-
35-
# Start Openvpn
36-
RUN /etc/startservice.sh --app=openvpn --run=/etc/app/openvpn/openvpn.sh
1+
FROM ham.base
2+
3+
4+
RUN echo ham.openvpn version-4.2.1
5+
6+
# Testing: pamtester
7+
RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories && \
8+
apk add --update openvpn iptables bash easy-rsa openvpn-auth-pam google-authenticator pamtester libqrencode && \
9+
ln -s /usr/share/easy-rsa/easyrsa /usr/local/bin && \
10+
rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/*
11+
12+
# Needed by scripts
13+
ENV OPENVPN=/etc/openvpn
14+
ENV EASYRSA=/usr/share/easy-rsa \
15+
EASYRSA_CRL_DAYS=3650 \
16+
EASYRSA_PKI=$OPENVPN/pki
17+
18+
#VOLUME ["/etc/openvpn"]
19+
20+
# Internally uses port 1194/udp, remap using `docker run -p 443:1194/tcp`
21+
EXPOSE 1194/udp
22+
23+
ADD data/bin /usr/local/bin
24+
ADD data/etc /etc
25+
RUN chmod a+x /usr/local/bin/*
26+
27+
# Add support for OTP authentication using a PAM module
28+
ADD data/otp/openvpn /etc/pam.d/
29+
30+
RUN mkdir -p /etc/app/openvpn
31+
COPY data/openvpn.sh /etc/app/openvpn
32+
RUN chmod +x /etc/app/openvpn/*.sh
33+
COPY data/openvpn.conf /etc/openvpn
34+
35+
# Start Openvpn
36+
RUN /etc/startservice.sh --app=openvpn --run=/etc/app/openvpn/openvpn.sh

‎docker/images/singlemaster/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ham.master
22

3-
RUN echo ham.singlemaster version-4.2.0
3+
RUN echo ham.singlemaster version-4.2.1
44

55
COPY data/*.* /etc/app/dns/
66
RUN chmod +x /etc/app/dns/*.sh

0 commit comments

Comments
 (0)