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

Remove Dockerfile.autoreducer.himem and update configurations #179

Merged
merged 1 commit into from
Sep 3, 2024
Merged

Remove Dockerfile.autoreducer.himem and update configurations #179

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
3 changes: 2 additions & 1 deletion Dockerfile.autoreducer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ RUN useradd snsdata -G snswheel
# put the developer configuration file in place
RUN mkdir -p /etc/autoreduce/
RUN mkdir -p /opt/postprocessing/log/
COPY tests/configuration/post_process_consumer.conf /etc/autoreduce/post_processing.conf
ARG CONFIG_FILE=tests/configuration/post_process_consumer.conf
COPY ${CONFIG_FILE} /etc/autoreduce/post_processing.conf

# install postprocessing
RUN dnf install -y https://github.com/neutrons/post_processing_agent/releases/download/v3.3/postprocessing-3.3.0-1.el9.noarch.rpm
Expand Down
42 changes: 0 additions & 42 deletions Dockerfile.autoreducer.himem
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile.webmonchow
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM continuumio/miniconda3:23.3.1-0
RUN conda install --yes -n base conda-libmamba-solver

# Install webmonchow
RUN conda install --yes --solver=libmamba -n base -c conda-forge -c neutrons postgresql=14 webmonchow=1.0.0
RUN conda install --yes --solver=libmamba -n base -c conda-forge -c neutrons postgresql=14 webmonchow=1.0.1

# Install webmonchow from a feature branch (only to test the latest changes in webmonchow)
# RUN conda install --yes --solver=libmamba -n base -c conda-forge postgresql=14
Expand Down
6 changes: 5 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ services:
build:
context: .
dockerfile: Dockerfile.autoreducer
args:
CONFIG_FILE: ./tests/configuration/post_process_consumer.conf
hostname: autoreducer
healthcheck:
test: ["CMD", "pgrep", "python"]
Expand All @@ -127,7 +129,9 @@ services:
autoreducer_himem:
build:
context: .
dockerfile: Dockerfile.autoreducer.himem
dockerfile: Dockerfile.autoreducer
args:
CONFIG_FILE: ./tests/configuration/post_process_consumer.himem.conf
hostname: autoreducer.himem
healthcheck:
test: ["CMD", "pgrep", "python"]
Expand Down