Skip to content

Commit cc9fce9

Browse files
committed
add docker test & remove -XX:+UseContainerSupport
1 parent 48c6b8f commit cc9fce9

File tree

3 files changed

+50
-4
lines changed

3 files changed

+50
-4
lines changed

.github/workflows/build.yml

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,31 @@ jobs:
101101
- name: Docker test
102102
shell: bash
103103
run: |
104-
docker run --rm -it -d --name=test localhost:5000/${GITHUB_REPOSITORY,,}:${{ env.release_version }}
104+
docker run --rm -it -d --memory="1g" -h openam.example.org --name=test localhost:5000/${GITHUB_REPOSITORY,,}:${{ env.release_version }}
105105
timeout 3m bash -c 'until docker inspect --format="{{json .State.Health.Status}}" test | grep -q \"healthy\"; do sleep 10; done'
106+
docker exec -w '/usr/openam/ssoconfiguratortools' test bash -c \
107+
'echo "ACCEPT_LICENSES=true
108+
SERVER_URL=http://openam.example.org:8080
109+
DEPLOYMENT_URI=/$OPENAM_PATH
110+
BASE_DIR=$OPENAM_DATA_DIR
111+
locale=en_US
112+
PLATFORM_LOCALE=en_US
113+
AM_ENC_KEY=
114+
ADMIN_PWD=passw0rd
115+
AMLDAPUSERPASSWD=p@passw0rd
116+
COOKIE_DOMAIN=example.org
117+
ACCEPT_LICENSES=true
118+
DATA_STORE=embedded
119+
DIRECTORY_SSL=SIMPLE
120+
DIRECTORY_SERVER=openam.example.org
121+
DIRECTORY_PORT=50389
122+
DIRECTORY_ADMIN_PORT=4444
123+
DIRECTORY_JMX_PORT=1689
124+
ROOT_SUFFIX=dc=openam,dc=example,dc=org
125+
DS_DIRMGRDN=cn=Directory Manager
126+
DS_DIRMGRPASSWD=passw0rd" > conf.file && java -jar openam-configurator-tool*.jar --file conf.file'
127+
sleep 35
128+
docker inspect --format="{{json .State.Health.Status}}" test | grep -q \"healthy\"
106129
build-docker-alpine:
107130
runs-on: 'ubuntu-latest'
108131
services:
@@ -150,5 +173,28 @@ jobs:
150173
- name: Docker test
151174
shell: bash
152175
run: |
153-
docker run --rm -it -d --name=test localhost:5000/${GITHUB_REPOSITORY,,}:${{ env.release_version }}-alpine
176+
docker run --rm -it -d --memory="1g" -h openam.example.org --name=test localhost:5000/${GITHUB_REPOSITORY,,}:${{ env.release_version }}-alpine
154177
timeout 3m bash -c 'until docker inspect --format="{{json .State.Health.Status}}" test | grep -q \"healthy\"; do sleep 10; done'
178+
docker exec -w '/usr/openam/ssoconfiguratortools' test bash -c \
179+
'echo "ACCEPT_LICENSES=true
180+
SERVER_URL=http://openam.example.org:8080
181+
DEPLOYMENT_URI=/$OPENAM_PATH
182+
BASE_DIR=$OPENAM_DATA_DIR
183+
locale=en_US
184+
PLATFORM_LOCALE=en_US
185+
AM_ENC_KEY=
186+
ADMIN_PWD=passw0rd
187+
AMLDAPUSERPASSWD=p@passw0rd
188+
COOKIE_DOMAIN=example.org
189+
ACCEPT_LICENSES=true
190+
DATA_STORE=embedded
191+
DIRECTORY_SSL=SIMPLE
192+
DIRECTORY_SERVER=openam.example.org
193+
DIRECTORY_PORT=50389
194+
DIRECTORY_ADMIN_PORT=4444
195+
DIRECTORY_JMX_PORT=1689
196+
ROOT_SUFFIX=dc=openam,dc=example,dc=org
197+
DS_DIRMGRDN=cn=Directory Manager
198+
DS_DIRMGRPASSWD=passw0rd" > conf.file && java -jar openam-configurator-tool*.jar --file conf.file'
199+
sleep 35
200+
docker inspect --format="{{json .State.Health.Status}}" test | grep -q \"healthy\"

openam-distribution/openam-distribution-docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ MAINTAINER Open Identity Platform Community <open-identity-platform-openam@googl
55
ENV CATALINA_HOME=/usr/local/tomcat \
66
OPENAM_PATH="openam" \
77
OPENAM_USER="openam" \
8-
MEMORY="-server -XX:+UseG1GC -XX:+UseContainerSupport" \
8+
MEMORY="-server -XX:+UseG1GC" \
99
OPENAM_DATA_DIR="/usr/openam/config"
1010
ENV PATH=$CATALINA_HOME/bin:$PATH \
1111
JAVA_OPTS="--add-exports java.base/sun.security.util=ALL-UNNAMED --add-exports java.security.jgss/sun.security.krb5=ALL-UNNAMED --add-exports java.base/sun.security.x509=ALL-UNNAMED --add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED --add-exports java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED" \

openam-distribution/openam-distribution-docker/Dockerfile-alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ MAINTAINER Open Identity Platform Community <open-identity-platform-openam@googl
55
ENV CATALINA_HOME=/usr/local/tomcat \
66
OPENAM_PATH="openam" \
77
OPENAM_USER="openam" \
8-
MEMORY="-server -XX:+UseG1GC -XX:+UseContainerSupport" \
8+
MEMORY="-server -XX:+UseG1GC" \
99
OPENAM_DATA_DIR="/usr/openam/config"
1010
ENV PATH=$CATALINA_HOME/bin:$PATH \
1111
CATALINA_OPTS="$MEMORY -Dcom.iplanet.services.configpath=$OPENAM_DATA_DIR -Dcom.sun.identity.configuration.directory=$OPENAM_DATA_DIR"

0 commit comments

Comments
 (0)