mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
fix some minor errors in helper dockerfiles
This commit is contained in:
einhorn_b
parent
7ecc23496f
commit
a4ad023b34
36
.github/workflows/debug.yml
vendored
36
.github/workflows/debug.yml
vendored
@ -62,25 +62,27 @@ jobs:
|
||||
#needs: [nothing]
|
||||
services:
|
||||
mariadb:
|
||||
image: mariadb/server:10.5
|
||||
image: gradido/mariadb:test
|
||||
env:
|
||||
MARIADB_ALLOW_EMPTY_PASSWORD: 1
|
||||
MARIADB_USER: root
|
||||
MARIADB_DATABASE: gradido_community_test
|
||||
#ports:
|
||||
#- 3306:3306
|
||||
options: --health-cmd="mysqladmin ping"
|
||||
--health-interval=5s
|
||||
--health-timeout=2s
|
||||
--health-retries=3
|
||||
login-server:
|
||||
image: gradido/login_server:latest
|
||||
ports:
|
||||
- 1201:1201
|
||||
steps:
|
||||
- name: Get MySQL service ID
|
||||
id: mariadb-service
|
||||
run: echo "::set-output name=container-id::$(docker ps | grep -i mariadb | awk '{print $1}')"
|
||||
#- name: Start Network
|
||||
#run: docker network create test-network
|
||||
- name: Connect Mariadb to network
|
||||
run: docker network connect test-network $(docker container ls | grep mariadb | awk '{ print $1 }')
|
||||
- name: Start Login-Server
|
||||
run: docker run --network test-network --name=login-server -d gradido/login_server:default
|
||||
- name: get login-server container id
|
||||
run: echo "::set-output name=LOGIN_SERVER_ID::$(docker container ls | grep login_server | awk '{ print $1 }')"
|
||||
id: login_server_container_id
|
||||
- name: show running container
|
||||
run: docker container ls
|
||||
- name: print login server container id
|
||||
run: echo ${{ steps.login_server_container_id.outputs.LOGIN_SERVER_ID }}
|
||||
# - name: Get MySQL service ID
|
||||
# id: mariadb-service
|
||||
# run: echo "::set-output name=container-id::$(docker ps | grep -i mariadb | awk '{print $1}')"
|
||||
#- name: Create docker network
|
||||
# run: docker network create gradido-network
|
||||
- name: Debug service
|
||||
@ -104,9 +106,11 @@ jobs:
|
||||
##########################################################################
|
||||
# UNIT TESTS BACKEND COMMUNITY-SERVER #######################################
|
||||
##########################################################################
|
||||
- name: check login-server
|
||||
run: docker logs ${{ steps.login_server_container_id.outputs.LOGIN_SERVER_ID }}
|
||||
- name: community server | Unit tests
|
||||
run: |
|
||||
docker run --network container:$(docker container ls | grep mariadb | awk '{ print $1 }') -v ~/coverage:/var/www/cakephp/webroot/coverage gradido/community_server:test
|
||||
docker run --network test-network -v ~/coverage:/var/www/cakephp/webroot/coverage gradido/community_server:test
|
||||
cp -r ~/coverage ./coverage
|
||||
|
||||
##########################################################################
|
||||
|
||||
21
.github/workflows/test.yml
vendored
21
.github/workflows/test.yml
vendored
@ -292,23 +292,16 @@ jobs:
|
||||
--health-interval=5s
|
||||
--health-timeout=2s
|
||||
--health-retries=3
|
||||
login_server:
|
||||
image: gradido/login_server:default
|
||||
#ports:
|
||||
# - 1201:1201
|
||||
steps:
|
||||
- name: get login-server container id
|
||||
run: LOGIN_SERVER_ID=$(docker container ls | grep login_server | awk '{ print $1 }')
|
||||
- name: debug running container
|
||||
run: docker container ps
|
||||
- name: Start Network
|
||||
run: docker network create test-network
|
||||
- name: Connect Mariadb to network
|
||||
run: docker network connect test-network $(docker container ls | grep mariadb | awk '{ print $1 }')
|
||||
- name: show login-server log
|
||||
run: docker logs ${LOGIN_SERVER_ID}
|
||||
- name: Connect Login-Server to network
|
||||
run: docker network connect test-network ${LOGIN_SERVER_ID}
|
||||
- name: Start Login-Server
|
||||
run: docker run --network test-network --name=login-server -d gradido/login_server:default
|
||||
- name: get login-server container id
|
||||
run: echo "::set-output name=LOGIN_SERVER_ID::$(docker container ls | grep login_server | awk '{ print $1 }')"
|
||||
id: login_server_container_id
|
||||
##########################################################################
|
||||
# CHECKOUT CODE ##########################################################
|
||||
##########################################################################
|
||||
@ -324,6 +317,10 @@ jobs:
|
||||
path: /tmp
|
||||
- name: Load Docker Image
|
||||
run: docker load < /tmp/community_server.tar
|
||||
|
||||
# for debugging login-server
|
||||
- name: check login-server
|
||||
run: docker logs ${{ steps.login_server_container_id.outputs.LOGIN_SERVER_ID }}
|
||||
##########################################################################
|
||||
# UNIT TESTS BACKEND COMMUNITY-SERVER #######################################
|
||||
##########################################################################
|
||||
|
||||
@ -43,7 +43,11 @@ COPY --from=release_default /usr/lib/libstdc++.so.6 /usr/lib/
|
||||
COPY --from=release_default /usr/lib/libgcc_s.so.1 /usr/lib/
|
||||
|
||||
COPY ./configs/login_server/grd_login.properties /etc/grd_login/
|
||||
COPY ./configs/login_server/cacert.pem /etc/grd_login/
|
||||
COPY ./configs/login_server/LOCALE /etc/grd_login/
|
||||
|
||||
EXPOSE 1200
|
||||
EXPOSE 1201
|
||||
|
||||
RUN chmod +x /usr/bin/Gradido_LoginServer
|
||||
ENTRYPOINT ["/usr/bin/Gradido_LoginServer"]
|
||||
|
||||
@ -9,12 +9,12 @@ RUN mkdir -p ${DOCKER_WORKDIR}
|
||||
WORKDIR ${DOCKER_WORKDIR}
|
||||
|
||||
# create databases
|
||||
COPY ./mariadb/setup_dbs.sql a_setup_dbs.sql
|
||||
COPY ./mariadb/setup_dbs.sql a1_setup_dbs.sql
|
||||
# login server db
|
||||
COPY ./login_server/skeema/ .
|
||||
RUN cd ./gradido_login/ && for f in *.sql; do cp -- "$f" "../b_$f"; sed -i '1i use gradido_login;' "../b_$f"; done
|
||||
RUN cd ./gradido_login/ && for f in *.sql; do cp -- "$f" "../b1_$f"; sed -i '1i use gradido_login;' "../b1_$f"; done
|
||||
COPY ./configs/login_server/setup_db_tables ./gradido_login/insert
|
||||
RUN cd ./gradido_login/insert && for f in *.sql; do cp -- "$f" "../../c_$f"; sed -i '1i use gradido_login;' "../../c_$f"; done
|
||||
RUN cd ./gradido_login/insert && for f in *.sql; do cp -- "$f" "../../c1_$f"; sed -i '1i use gradido_login;' "../../c1_$f"; done
|
||||
# community server db
|
||||
COPY ./community_server/db/skeema/ .
|
||||
RUN cd ./gradido_community/ && for f in *.sql; do cp -- "$f" "../d_$f"; sed -i '1i use gradido_community;' "../d_$f"; done
|
||||
@ -31,6 +31,6 @@ COPY ./mariadb/setup_test_dbs.sql a2_setup_dbs.sql
|
||||
|
||||
# login server test db
|
||||
COPY ./login_server/skeema/ .
|
||||
RUN cd ./gradido_login/ && for f in *.sql; do cp -- "$f" "../b_$f"; sed -i '1i use gradido_login_test;' "../b_$f"; done
|
||||
RUN cd ./gradido_login/ && for f in *.sql; do cp -- "$f" "../b2_$f"; sed -i '1i use gradido_login_test;' "../b2_$f"; done
|
||||
COPY ./configs/login_server/setup_db_tables ./gradido_login/insert
|
||||
RUN cd ./gradido_login/insert && for f in *.sql; do cp -- "$f" "../../c_$f"; sed -i '1i use gradido_login_test;' "../../c_$f"; done
|
||||
RUN cd ./gradido_login/insert && for f in *.sql; do cp -- "$f" "../../c2_$f"; sed -i '1i use gradido_login_test;' "../../c2_$f"; done
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user