Skip to content

Commit db0b2ee

Browse files
authored
Script check 2 (#156)
* Fixed scripts * Added test for All Scripts * Added test for docker images * Minor fixes on recording * Added "force" to proxies
1 parent 9d3acf5 commit db0b2ee

File tree

81 files changed

+332
-138
lines changed

Some content is hidden

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

81 files changed

+332
-138
lines changed

CHANGELOG.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

DEPLOY.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
## DEPLOY
2+
3+
export DOCKER_DEPLOY=true
4+
# The docker on which should firstly deploy
5+
export DOCKER_HOST=tcp://192.168.1.40:23750
6+
./scripts/build/build_release.sh
7+
./scripts/build/build_release_samples.sh
8+
./scripts/build/build_docker.sh TWICE....
9+
./scripts/build/build_docker_samples.sh TWICE....
10+
./scripts/build/deploy_jar.sh
11+
Upload on github the releases on release dir
12+
13+
14+
## TEST
15+
16+
unset DOCKER_DEPLOY
17+
# The docker on which should firstly deploy
18+
export DOCKER_IP=192.168.1.40
19+
export DOCKER_HOST=tcp://$DOCKER_IP:23750
20+
./globaltest.sh
21+
Upload on github the releases on release dir
22+
23+
24+
## CLeanup
25+
26+
docker rmi $(docker images | grep "<none>"|grep -v "kendar" | awk "{print $3}")

docker/images/apache-php8/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ham.apache
22

3-
RUN echo ham.apache 4.1.4
3+
RUN echo ham.apache 4.1.5
44

55
# Setup apache and php
66
RUN apk add --no-cache \
@@ -25,8 +25,10 @@ RUN apk add --no-cache \
2525
php8-session \
2626
php8-xml \
2727
php8-pear \
28-
php8-xdebug --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
28+
php8-xdebug \
2929
&& mkdir -p docker/php/conf.d
30+
31+
# WAS ON --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing
3032

3133
RUN pear8 config-set php_ini /etc/php8/php.ini
3234

docker/images/apache/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.apache 4.1.4
3+
RUN echo ham.apache 4.1.5
44

55
# Setup apache and php
66
RUN apk --no-cache add apache2 apache2-ssl curl \

docker/images/base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM alpine:latest
22
RUN apk update
33
RUN apk upgrade
44

5-
RUN echo ham.base 4.1.4
5+
RUN echo ham.base 4.1.5
66

77
ENV JAVA11_HOME /usr/lib/jvm/java-11-openjdk
88

docker/images/client/Dockerfile

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

3-
RUN echo ham.client 4.1.4
3+
RUN echo ham.client 4.1.5
44

55
# Setup localdns
66
RUN mkdir -p /etc/app/simpledns/

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 openforti 4.1.4
34+
RUN echo openforti 4.1.5
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 4.1.4
7+
RUN echo 4.1.5
88

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

docker/images/master/Dockerfile

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

3-
RUN echo 4.1.4
3+
RUN echo 4.1.5
44

55
COPY data/ham.sh /etc/app/ham/
66
COPY data/app /etc/app/ham/app/

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 4.1.4
3+
RUN echo 4.1.5
44

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

0 commit comments

Comments
 (0)