Skip to content

Commit db0b2ee

Browse files
kendarorgkendarorg
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

‎docker/images/openvpn/Dockerfile

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

33

4-
RUN echo 4.1.4
4+
RUN echo 4.1.5
55

66
# Testing: pamtester
77
RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories && \

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

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

‎docker/templates/master/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM ham.singlemaster:latest
2-
RUN echo 4.1.4
2+
RUN echo 4.1.5
33

44
COPY ./config/*.json /etc/app/ham/app/
55
RUN mkdir -p /etc/app/app

‎docs/docker/multi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Remember the ports!!!
3333
export PATH="${JAVA_HOME}/bin:${PATH}"
3434

3535
cd /etc/app/fe
36-
java -jar -Dserver.port=80 /etc/app/fe/fe-4.1.4.jar
36+
java -jar -Dserver.port=80 /etc/app/fe/fe-4.1.5.jar
3737

3838
Then the properties file
3939

‎docs/docker/single.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Remember the ports!!!
3232
export PATH="${JAVA_HOME}/bin:${PATH}"
3333

3434
cd /etc/app/fe
35-
java -jar -Dserver.port=8080 /etc/app/fe/fe-4.1.4.jar
35+
java -jar -Dserver.port=8080 /etc/app/fe/fe-4.1.5.jar
3636

3737
Then the properties file
3838

‎docs/jdbc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ classpath! The resulting command line will be
5555

5656
The final command line (for HAM calendar/be sample) will be (on windows)
5757

58-
java -cp "be-4.1.4.jar;../janus-driver-1.1.10-SNAPSHOT.jar" ^
58+
java -cp "be-4.1.5.jar;../janus-driver-1.1.10-SNAPSHOT.jar" ^
5959
org.springframework.boot.loader.JarLauncher ^
6060
--spring.config.location=file:///%cd%\bedbham.application.properties
6161

‎docs/scripts.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
* version.txt: the current version
2+
3+
To deploy docker stuffs should set the docker host. For me is
4+
5+
export DOCKER_HOST=tcp://192.168.1.40:23750
6+
27
* build: Build scripts
38
* build_docs: Regenerate the "puzzle" documentation
4-
* build_docker: Create local docker images for HAM and deploy
5-
* build_docker_samples: Create local docker images for Samples and deploy
9+
* build_docker: Create local docker images for HAM and if set DOCKER_DEPLOY=true deploy
10+
* build_docker_samples: Create local docker images for Samples and if set DOCKER_DEPLOY=true deploy
611
* build_release: Create the release tar.gz into "release" dir for HAM
712
* build_release_samples: Create the release tar.gz into "release" dir for Samples
813
* clean: Clean all projects

‎globaltest.sh

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ HAM_MAIN_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd
33
export LANG=en_US.UTF-8
44
export LC_ALL=$LANG
55

6+
7+
68
. $HAM_MAIN_DIR/scripts/libs/version.sh
79
. $HAM_MAIN_DIR/scripts/libs/runner.sh
810

@@ -87,15 +89,45 @@ if true; then
8789
run_till_start 60 gateway.sh http://127.0.0.1:8090/api/v1/health
8890
terminate_app gateway.sh java HttpAnswering
8991
echo [INFO] END calendar/scripts/gateway.sh
92+
93+
echo [INFO] BEG calendar/scripts/ham.sh
94+
cd $HAM_MAIN_DIR/release/calendar/scripts
95+
export http_proxy=http://127.0.0.1:1081
96+
run_till_start 60 ham.sh http://www.local.test/api/health
97+
terminate_app ham.sh java HttpAnswering
98+
unset http_proxy
99+
echo [INFO] END calendar/scripts/ham.sh
100+
101+
echo [INFO] BEG calendar/scripts/bedb.sh
102+
cd $HAM_MAIN_DIR/release/calendar
103+
run_till_start 60 rundb.sh http://localhost:8082
104+
sleep 5
105+
cd $HAM_MAIN_DIR/release/calendar/scripts
106+
run_till_start 60 bedb.sh http://127.0.0.1:8100/api/v1/health
107+
terminate_app bedb.sh java HttpAnswering
108+
terminate_app bedb.sh java org.h2.tools.Server
109+
echo [INFO] END calendar/scripts/bedb.sh
110+
rm -rf $HAM_MAIN_DIR/release/calendar/data
90111
fi
91112

92-
echo [INFO] BEG calendar/scripts/ham.sh
93-
cd $HAM_MAIN_DIR/release/calendar/scripts
94-
export http_proxy=http://127.0.0.1:1081
95-
run_till_start 60 ham.sh http://www.local.test/api/health
96-
terminate_app ham.sh java HttpAnswering
113+
cd $HAM_MAIN_DIR/scripts/build
114+
./build_docker.sh
115+
./build_docker_samples.sh
116+
cd $HAM_MAIN_DIR/samples/calendar/hub_composer
117+
nohup docker-compose -f docker-compose-local.yml up 2>&1 > /dev/null &
118+
119+
export http_proxy=http://$DOCKER_IP:1081
120+
wait_till_start 60 http://www.local.test/api/health
121+
wait_till_start 60 http://www.sample.test/api/v1/health
122+
wait_till_start 60 http://gateway.sample.test/api/v1/health
123+
wait_till_start 60 http://be.sample.test/api/v1/health
97124
unset http_proxy
98-
echo [INFO] END calendar/scripts/ham.sh
125+
126+
docker-compose -f docker-compose-local.yml down 2>&1 > /dev/null &
127+
128+
129+
130+
99131

100132

101133

‎ham/api.ham/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>HttpAnsweringMachine</artifactId>
77
<groupId>org.kendar</groupId>
8-
<version>4.1.4</version>
8+
<version>4.1.5</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

‎ham/api.js.builder/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>HttpAnsweringMachine</artifactId>
77
<groupId>org.kendar</groupId>
8-
<version>4.1.4</version>
8+
<version>4.1.5</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

‎ham/api.replayer/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>HttpAnsweringMachine</artifactId>
77
<groupId>org.kendar</groupId>
8-
<version>4.1.4</version>
8+
<version>4.1.5</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

‎ham/api.test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>HttpAnsweringMachine</artifactId>
77
<groupId>org.kendar</groupId>
8-
<version>4.1.4</version>
8+
<version>4.1.5</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

‎ham/app.commons/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>HttpAnsweringMachine</artifactId>
77
<groupId>org.kendar</groupId>
8-
<version>4.1.4</version>
8+
<version>4.1.5</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

‎ham/app.dns/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>HttpAnsweringMachine</artifactId>
77
<groupId>org.kendar</groupId>
8-
<version>4.1.4</version>
8+
<version>4.1.5</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

‎ham/app.http.standardfilters/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>HttpAnsweringMachine</artifactId>
77
<groupId>org.kendar</groupId>
8-
<version>4.1.4</version>
8+
<version>4.1.5</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

‎ham/app.http/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>HttpAnsweringMachine</artifactId>
77
<groupId>org.kendar</groupId>
8-
<version>4.1.4</version>
8+
<version>4.1.5</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

‎ham/app/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>HttpAnsweringMachine</artifactId>
2525
<groupId>org.kendar</groupId>
26-
<version>4.1.4</version>
26+
<version>4.1.5</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929
<packaging>jar</packaging>

‎ham/jacoco/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>HttpAnsweringMachine</artifactId>
77
<groupId>org.kendar</groupId>
8-
<version>4.1.4</version>
8+
<version>4.1.5</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

‎ham/lib.schema.checker/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>HttpAnsweringMachine</artifactId>
77
<groupId>org.kendar</groupId>
8-
<version>4.1.4</version>
8+
<version>4.1.5</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

‎ham/plugin.js.filters/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>HttpAnsweringMachine</artifactId>
77
<groupId>org.kendar</groupId>
8-
<version>4.1.4</version>
8+
<version>4.1.5</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

‎ham/plugin.oidc.server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>HttpAnsweringMachine</artifactId>
77
<groupId>org.kendar</groupId>
8-
<version>4.1.4</version>
8+
<version>4.1.5</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

‎ham/plugin.replayer.commons/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>HttpAnsweringMachine</artifactId>
77
<groupId>org.kendar</groupId>
8-
<version>4.1.4</version>
8+
<version>4.1.5</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎ham/plugin.replayer.http/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>HttpAnsweringMachine</artifactId>
77
<groupId>org.kendar</groupId>
8-
<version>4.1.4</version>
8+
<version>4.1.5</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎ham/plugin.replayer.jdbc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>HttpAnsweringMachine</artifactId>
77
<groupId>org.kendar</groupId>
8-
<version>4.1.4</version>
8+
<version>4.1.5</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎ham/plugin.replayer.server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>HttpAnsweringMachine</artifactId>
77
<groupId>org.kendar</groupId>
8-
<version>4.1.4</version>
8+
<version>4.1.5</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

0 commit comments

Comments
 (0)