Skip to content
Snippets Groups Projects

Support for podman + more control on git branches

Merged François LAURENT requested to merge podman-support into dev
2 files
+ 67
53
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 7
25
FROM julia:1.8.5-bullseye AS base
FROM julia:1.9.0-bullseye AS base
ARG PROJECT_DIR=/app
ARG BRANCH=main
@@ -35,12 +35,12 @@ RUN apt-get update \
FROM prebuild AS backend
ARG PROJECT_DIR=/app
ARG BRANCH=main
ARG TAGGINGBACKENDS_BRANCH=$BRANCH
ARG BACKEND
RUN if [ "$BACKEND" = "MaggotUBA/20221005-1" ]; then \
cd $PROJECT_DIR \
&& julia -e "using Pkg; Pkg.add(url=\"https://gitlab.pasteur.fr/nyx/TaggingBackends\", rev=\"$BRANCH\")" \
&& julia -e "using Pkg; Pkg.add(url=\"https://gitlab.pasteur.fr/nyx/TaggingBackends\", rev=\"$TAGGINGBACKENDS_BRANCH\")" \
&& git clone --depth 1 --no-tags --single-branch -b 20221005 https://gitlab.pasteur.fr/nyx/MaggotUBA-adapter MaggotUBA \
&& cd MaggotUBA \
&& rm -rf .git \
@@ -50,7 +50,7 @@ RUN if [ "$BACKEND" = "MaggotUBA/20221005-1" ]; then \
&& rm -rf ~/.cache; \
elif [ "$BACKEND" = "MaggotUBA/20221228" ]; then \
cd $PROJECT_DIR \
&& julia -e "using Pkg; Pkg.add(url=\"https://gitlab.pasteur.fr/nyx/TaggingBackends\", rev=\"$BRANCH\")" \
&& julia -e "using Pkg; Pkg.add(url=\"https://gitlab.pasteur.fr/nyx/TaggingBackends\", rev=\"$TAGGINGBACKENDS_BRANCH\")" \
&& git clone --depth 1 --no-tags --single-branch -b dev https://gitlab.pasteur.fr/nyx/MaggotUBA-adapter MaggotUBA \
&& cd MaggotUBA \
&& rm -rf .git \
@@ -64,28 +64,10 @@ RUN if [ "$BACKEND" = "MaggotUBA/20221005-1" ]; then \
&& apt-get autoremove -y wget \
&& rm -rf /var/lib/apt/lists/* \
&& rm -rf ~/.cache; \
elif [ "$BACKEND" = "MaggotUBA/20230111" ]; then \
cd $PROJECT_DIR \
&& julia -e "using Pkg; Pkg.add(url=\"https://gitlab.pasteur.fr/nyx/TaggingBackends\", rev=\"$BRANCH\")" \
&& git clone --depth 1 --no-tags --single-branch -b 20230111 https://gitlab.pasteur.fr/nyx/MaggotUBA-adapter MaggotUBA \
&& cd MaggotUBA \
&& rm -rf .git \
&& poetry install --only main \
&& poetry add "pynvml==11.4.1" \
&& rm -rf ~/.cache; \
elif [ "$BACKEND" = "MaggotUBA/20230129" ]; then \
cd $PROJECT_DIR \
&& julia -e "using Pkg; Pkg.add(url=\"https://gitlab.pasteur.fr/nyx/TaggingBackends\", rev=\"$BRANCH\")" \
&& git clone --depth 1 --no-tags --single-branch -b 20230129 https://gitlab.pasteur.fr/nyx/MaggotUBA-adapter MaggotUBA \
&& cd MaggotUBA \
&& rm -rf .git \
&& poetry install --only main \
&& poetry add "pynvml==11.4.1" \
&& rm -rf ~/.cache; \
elif [ "$BACKEND" = "MaggotUBA/20230311" ]; then \
elif [ "$(echo $BACKEND | cut -d/ -f1)" = "MaggotUBA" ]; then \
cd $PROJECT_DIR \
&& julia -e "using Pkg; Pkg.add(url=\"https://gitlab.pasteur.fr/nyx/TaggingBackends\", rev=\"$BRANCH\")" \
&& git clone --depth 1 --no-tags --single-branch -b 20230311 https://gitlab.pasteur.fr/nyx/MaggotUBA-adapter MaggotUBA \
&& julia -e "using Pkg; Pkg.add(url=\"https://gitlab.pasteur.fr/nyx/TaggingBackends\", rev=\"$TAGGINGBACKENDS_BRANCH\")" \
&& git clone --depth 1 --no-tags --single-branch -b $(echo $BACKEND | cut -d/ -f2) https://gitlab.pasteur.fr/nyx/MaggotUBA-adapter MaggotUBA \
&& cd MaggotUBA \
&& rm -rf .git \
&& poetry install --only main \
Loading