Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Create docker images" #199

Merged
merged 1 commit into from
May 27, 2024
Merged

Revert "Create docker images" #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions .docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
FROM mariadb:latest
ARG VERSION
LABEL org.opencontainers.image.authors="DRKZ-CLINT"
LABEL org.opencontainers.image.source="https://github.com/FREVA-CLINT/freva"
LABEL org.opencontainers.image.version="$VERSION"
LABEL maintainer="DRKZ-CLINT"
LABEL repository="https://gitlab.dkrz.de/freva/evaluation_system"
ARG binder="true"
## Set all environment variables
ENV SOLR_HOME=/opt/evaluation_system/.solr \
Expand Down Expand Up @@ -45,7 +43,7 @@ RUN set -x && \
mkdir -p /etc/jupyter /usr/freva_output && \
chmod -R 2777 /usr/freva_output &&\
mkdir -p /mnt/freva_plugins/dummy/.git &&\
mv /tmp/evaluation_system/.docker/git_config /mnt/freva_plugins/dummy/.git/ &&\
mv /tmp/evaluation_system/.git/config /mnt/freva_plugins/dummy/.git/ &&\
cp /tmp/evaluation_system/src/evaluation_system/tests/mocks/dummy.py /mnt/freva_plugins/dummy &&\
cp /mnt/freva_plugins/animator/.git/config . &&\
rm -fr /mnt/freva_plugins/animator/.git/* &&\
Expand Down Expand Up @@ -92,12 +90,12 @@ RUN set -x && \
echo "set -e" > /tmp/mysql_init &&\
echo "mariadb-install-db" >> /tmp/mysql_init &&\
echo "nohup mariadbd --skip-grant-tables &" >> /tmp/mysql_init &&\
echo "mariadb-admin --socket=${MYSQL_HOME}/mysql.${MYSQL_PORT}.sock --wait=5 ping || exit 1" >> /tmp/mysql_init &&\
echo "mysqladmin --socket=${MYSQL_HOME}/mysql.${MYSQL_PORT}.sock --wait=5 ping || exit 1" >> /tmp/mysql_init &&\
bash /tmp/mysql_init && rm /tmp/mysql_init &&\
cat ${MYSQL_LOGS_DIR}/mysql-${MYSQL_PORT}-console.err &&\
mariadb -u root -h 127.0.0.1 < /tmp/set_root_pw &&\
mariadb -u root -h 127.0.0.1 -pT3st < /docker-entrypoint-initdb.d/create_user.sql &&\
mariadb -u root -pT3st -h 127.0.0.1 -D freva < /docker-entrypoint-initdb.d/create_tables.sql &&\
mysql -u root -h 127.0.0.1 < /tmp/set_root_pw &&\
mysql -u root -h 127.0.0.1 -pT3st < /docker-entrypoint-initdb.d/create_user.sql &&\
mysql -u root -pT3st -h 127.0.0.1 -D freva < /docker-entrypoint-initdb.d/create_tables.sql &&\
chown -R freva:freva ${EVAL_HOME} ${MYSQL_HOME} ${SOLR_HOME} && \
chmod -R 775 ${MYSQL_HOME} ${SOLR_HOME} && \
rm -fr /tmp/set_root_pw /tmp/evaluation_system
Expand Down
15 changes: 0 additions & 15 deletions .docker/git_config
View file
Open in desktop

This file was deleted.

69 changes: 0 additions & 69 deletions .github/workflows/build_containers.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/freva-clint/freva:latest
FROM antarcticrainforest/freva

ARG NB_USER="nb_user"
ARG NB_UID="1000"
Expand Down
2 changes: 1 addition & 1 deletion compose/config
Open in desktop
Submodule config updated 2 files
+0 −1 solr/managed-schema.xml
+1 −2 solr/synonyms.txt
3 changes: 0 additions & 3 deletions src/evaluation_system/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,3 @@


__version__ = "2406.0.0"

if __name__ == "__main__":
print(__version__)
Loading