Commit 0925c3e9 authored by Raphael Jacquot's avatar Raphael Jacquot

Merge branch 'master' of gricad-gitlab.univ-grenoble-alpes.fr:OSUG/JMMC/jmmc-jmdcui-docker

parents 64459741 d76c4409
Pipeline #27028 skipped with stage
IMAGE_TAG=0.1-alpha
IMAGE_TAG=0.2-alpha
......@@ -26,7 +26,7 @@ services:
- jmdc-postgres-data:/var/lib/postgresql/
networks:
- jmdc
tty: true
# tty: true
# comming : jmdc-tap
# links:
......
......@@ -4,6 +4,10 @@ FROM chbrandt/dachs:postgres
#WORKDIR /tmp
#RUN for s in $SQL_FILES ; do wget https://svn.jmmc.fr/jmmc-web/trunk/exist/jmdc/conf/$s ; done
# Hack to avoid tty requirements (imposible with docker_service)
RUN apt-get install -y gosu;
COPY dachs.sh /dachs.sh
RUN PGDATA=/var/lib/postgresql/${PG_VERSION} \
mkdir -p -m 777 /var/run/postgresql/${PG_VERSION}-main.pg_stat_tmp/ && \
su - postgres -c "/usr/lib/postgresql/${PG_VERSION}/bin/postgres \
......@@ -15,6 +19,6 @@ RUN PGDATA=/var/lib/postgresql/${PG_VERSION} \
echo "done" ;
# for s in $SQL_FILES ; do echo "processing $s ..." ; su postgres -c "psql jmdc < $s"; done
RUN sed -i "s@172.17.0.0/24@172.16.0.0/12@g" /etc/postgresql/${PG_VERSION}/main/pg_hba.conf
CMD ["/bin/bash", "--rcfile", "/dachs.sh"]
RUN sed -i "s@172.17.0.0/24@172.16.0.0/12@g" /etc/postgresql/${PG_VERSION}/main/pg_hba.conf
CMD ["/dachs.sh"]
#!/bin/bash
echo ''
echo '==================================================='
echo 'This is the PostgreSQL counterpart of DaCHS server.'
echo 'Unless you want to put your hands on the databse,'
echo 'you should be good to go and deal with the DaCHS'
echo 'server main conatiner itself.'
echo ''
echo 'To make use of this guy here, just make sure to'
echo 'run "dachs:server" with docker "--link" option'
echo 'pointing to this container here.'
echo '==================================================='
echo ''
export PGDATA=/var/lib/postgresql/${PG_VERSION}
# postgres needs this directory for log files; then start postgres
mkdir -p -m 777 /var/run/postgresql/${PG_VERSION}-main.pg_stat_tmp/
exec gosu postgres /usr/lib/postgresql/${PG_VERSION}/bin/postgres \
-c config_file=/etc/postgresql/${PG_VERSION}/main/postgresql.conf \
-c logging_collector=on
......@@ -2,3 +2,4 @@ sample-01.file : few records on top of injest format
sample-02.file : test data using user format
sample-03.file : test data using user format with extra columns
sample-04.file : test data using user format with shuffled columns
sample-05.file : test data using user format with valid but duplicated records
UD_MEAS,LD_MEAS,E_LD_MEAS,MU_LAMBDA,BAND,METHOD,NOTES,REFERENCE,ID
1.0,1.1,.1,.6543,K,1,valid star,2018MNRAS.477.4403W,HD18884
1.0,1.1,.1,.6543,K,1,duplicated valid star,2018MNRAS.477.4403W,HD18884
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment