Skip to content

Commit

Permalink
experimental update
Browse files Browse the repository at this point in the history
  • Loading branch information
bgruening committed Nov 18, 2024
1 parent 1f5e372 commit a064b0c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions galaxy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
# * the playbooks are not cleaning anything up
#

FROM buildpack-deps:22.04 AS build_base
FROM buildpack-deps:24.04 AS build_base

ENV GALAXY_ROOT_DIR=/galaxy \
GALAXY_VIRTUAL_ENV=/galaxy_venv \
GALAXY_HOME=/home/galaxy \
GALAXY_CONDA_PREFIX=/tool_deps/_conda \
MINIFORGE_VERSION=24.3.0-0
MINIFORGE_VERSION=24.9.2-0


# Install miniforge and then virtualenv from conda
Expand Down Expand Up @@ -70,7 +70,7 @@ RUN cd / \
&& make -j 4 && make install


FROM ubuntu:22.04 AS galaxy_cluster_base
FROM ubuntu:24.04 AS galaxy_cluster_base

ENV GALAXY_ROOT_DIR=/galaxy \
GALAXY_VIRTUAL_ENV=/galaxy_venv \
Expand Down Expand Up @@ -117,7 +117,7 @@ RUN apt-get -qq update \
&& add-apt-repository ppa:ansible/ansible-7 \
&& apt install -y ansible \
# Make python3 standard
&& update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \
&& update-alternatives --install /usr/bin/python python /usr/bin/python3 12 \
&& apt purge -y software-properties-common systemd && apt-get autoremove -y && apt-get clean \
# Install ansible roles
&& ansible-galaxy install -r /ansible/requirements.yml -p /ansible/roles \
Expand Down
2 changes: 1 addition & 1 deletion galaxy/ansible/condor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
connection: local
remote_user: root
vars:
htcondor_version: 23.x
htcondor_version: 24.x
htcondor_channel: current
htcondor_role_submit: true
htcondor_password: changeme
Expand Down

0 comments on commit a064b0c

Please sign in to comment.