mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
adding my stuff for login_server and community_server
This commit is contained in:
parent
ed53ee7cf4
commit
46daa8fc8a
@ -1 +1 @@
|
|||||||
Subproject commit 9fa87aac2053af28c5efaf57148461d8a8c85195
|
Subproject commit 912c1f4d11f30bd5671c7e512fff02602c5d91b4
|
||||||
@ -27,8 +27,21 @@ services:
|
|||||||
## login server
|
## login server
|
||||||
login-server:
|
login-server:
|
||||||
build:
|
build:
|
||||||
|
context: ./login_server/
|
||||||
target: login_server_debug
|
target: login_server_debug
|
||||||
#backend:
|
security_opt:
|
||||||
|
- seccomp:unconfined
|
||||||
|
#cap-add:SYS_PTRACE
|
||||||
|
depends_on:
|
||||||
|
- mariadb
|
||||||
|
networks:
|
||||||
|
- internal-net
|
||||||
|
ports:
|
||||||
|
- 1200:1200
|
||||||
|
- 1201:1201
|
||||||
|
volumes:
|
||||||
|
- ./configs/login_server:/etc/grd_login
|
||||||
|
- ./logs:/var/log/grd_login
|
||||||
# image: ocelotsocialnetwork/backend:development
|
# image: ocelotsocialnetwork/backend:development
|
||||||
# build:
|
# build:
|
||||||
# target: development
|
# target: development
|
||||||
|
|||||||
@ -41,7 +41,7 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: ./mariadb/Dockerfile
|
dockerfile: ./mariadb/Dockerfile
|
||||||
target: mariadb_DIV
|
target: mariadb_server
|
||||||
environment:
|
environment:
|
||||||
- MARIADB_ALLOW_EMPTY_PASSWORD=1
|
- MARIADB_ALLOW_EMPTY_PASSWORD=1
|
||||||
- MARIADB_USER='root'
|
- MARIADB_USER='root'
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
Subproject commit 75c672369f10423a916421c82eb987a8205a376c
|
Subproject commit fa936dbc80860472a5cbc3d877cf130a0be916b3
|
||||||
@ -11,19 +11,30 @@ RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /go/bin/skeema .
|
|||||||
#########################################################################################################
|
#########################################################################################################
|
||||||
From mariadb/server:10.5 as mariadb_server
|
From mariadb/server:10.5 as mariadb_server
|
||||||
|
|
||||||
#ENV DOCKER_WORKDIR="/docker-entrypoint-initdb.d"
|
ENV DOCKER_WORKDIR="/docker-entrypoint-initdb.d"
|
||||||
ENV DOCKER_WORKDIR="/skeema"
|
#ENV DOCKER_WORKDIR="/skeema"
|
||||||
|
|
||||||
# copy skeema
|
# copy skeema
|
||||||
COPY --from=skeema_build /go/bin/skeema /usr/bin/
|
#COPY --from=skeema_build /go/bin/skeema /usr/bin/
|
||||||
|
|
||||||
RUN mkdir -p ${DOCKER_WORKDIR}
|
RUN mkdir -p ${DOCKER_WORKDIR}
|
||||||
WORKDIR ${DOCKER_WORKDIR}
|
WORKDIR ${DOCKER_WORKDIR}
|
||||||
#COPY ./mariadb/.skeema .
|
#COPY ./mariadb/.skeema .
|
||||||
COPY ./login_server/skeema/ .
|
#COPY ./login_server/skeema/ .
|
||||||
#COPY ./mariadb/.skeema.login ./gradido_login/.skeema
|
#COPY ./mariadb/.skeema.login ./gradido_login/.skeema
|
||||||
COPY ./community_server/skeema/ .
|
#COPY ./community_server/skeema/ .
|
||||||
|
#RUN for f in *.c; do cp -- "$f" "$OTHERDIR/old#$f"; done
|
||||||
|
|
||||||
|
# create databases
|
||||||
|
COPY ./mariadb/setup_dbs.sql a_setup_dbs.sql
|
||||||
|
# login server db
|
||||||
|
COPY ./login_server/skeema/ .
|
||||||
|
RUN cd ./gradido_login/ && for f in *.sql; do cp -- "$f" "../b_$f"; done
|
||||||
|
# community server db
|
||||||
|
COPY ./community_server/skeema/ .
|
||||||
|
RUN cd ./gradido_community/ && for f in *.sql; do cp -- "$f" "../c_$f"; done
|
||||||
|
RUN cd ./gradido_community/insert && for f in *.sql; do cp -- "$f" "../../d_$f"; done
|
||||||
|
RUN ls -ls
|
||||||
|
|
||||||
|
|
||||||
#USER mysql
|
#USER mysql
|
||||||
@ -42,7 +53,7 @@ From alpine:latest as mariadb_DIV
|
|||||||
|
|
||||||
ENV DOCKER_WORKDIR="/skeema"
|
ENV DOCKER_WORKDIR="/skeema"
|
||||||
|
|
||||||
|
#VOLUME /var/lib/mysql
|
||||||
|
|
||||||
#RUN apt-get update \
|
#RUN apt-get update \
|
||||||
# && apt-get -y --no-install-recommends install mariadb-server mariadb-client \
|
# && apt-get -y --no-install-recommends install mariadb-server mariadb-client \
|
||||||
@ -64,11 +75,11 @@ COPY ./mariadb/.skeema.community ./gradido_community/.skeema
|
|||||||
|
|
||||||
USER mysql
|
USER mysql
|
||||||
#VOLUME /var/lib/mysql
|
#VOLUME /var/lib/mysql
|
||||||
RUN mysqld
|
#RUN mysqld
|
||||||
RUN chmod +x ./setup_dbs.sh
|
#RUN chmod +x ./setup_dbs.sh
|
||||||
RUN mysql < setup_dbs.sql
|
#RUN mysql < setup_dbs.sql
|
||||||
RUN skeema push
|
#RUN skeema push
|
||||||
|
|
||||||
EXPOSE 3306
|
#EXPOSE 3306
|
||||||
|
|
||||||
CMD ["mysld"]
|
#CMD ["mysld"]
|
||||||
Loading…
x
Reference in New Issue
Block a user