Skip to content

Commit

Permalink
Add version streamflow
Browse files Browse the repository at this point in the history
  • Loading branch information
antarcticrainforest committed Mar 14, 2024
1 parent b01013a commit c3e7705
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/build_job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ run-name: ${{ github.actor }} is building the container
tags:
- '*'
branches:
- 'main'
- 'version'

jobs:
build-and-push-image:
Expand All @@ -33,6 +33,10 @@ jobs:
name: Set up QEMU
uses: docker/setup-qemu-action@v1

-
name: Set docker version label
run: sed -i 's/<VERSION>/${{ steps.repository.outputs.repo }}/g'

-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
Expand Down
11 changes: 9 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG FREVA_WEB_DIR=/opt/freva_web
FROM condaforge/mambaforge
LABEL maintainer="DRKZ-CLINT"
LABEL repository="https://github.com/FREVA-CLINT/freva-web"

LABEL release="<VERSION>"
ARG CONDA_ENV_DIR
ARG FREVA_WEB_DIR

Expand All @@ -13,14 +13,21 @@ COPY . .

ENV PATH=$CONDA_ENV_DIR/bin:$PATH\
DJANGO_SUPERUSER_EMAIL=freva@dkrz.de
RUN set -e && \
groupadd -r --gid 1000 freva && \
adduser --uid "freva" --gid 1000 --gecos "Freva user" \
--shell /bin/bash --disabled-password "freva" --home ${FREVA_WEB_DIR} && \
chown -R freva:freva ${FREVA_WEB_DIR}


RUN set -e \
&& mamba env create -p ${CONDA_ENV_DIR} -f conda-env.yml \
&& npm install && npm run build-production \
&& mamba clean -afy \
&& rm -rf node_modules \
&& echo "export PATH=${PATH}" >> /root/.bashrc
&& echo "export PATH=${PATH}" >> ${FREVA_WEB_DIR}/.bashrc

EXPOSE 8000
USER freva

CMD ./init_django.sh
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "evaluation_system_web",
"version": "2023.08.23",
"version": "2403.0.0",
"description": "React-bits of the freva-web interface. The react-parts of the web interface include the plugin-selection, the data-browser and the result-browser",
"main": "index.js",
"engines": {
Expand Down

0 comments on commit c3e7705

Please sign in to comment.