Skip to content

Commit e28f20e

Browse files
author
A Wokaty
committed
Add required to compile apt pkgs
1 parent cce0b86 commit e28f20e

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG BASE_IMAGE=ubuntu:noble
22
FROM ${BASE_IMAGE} AS build
33
ARG CYCLE=release
4-
ARG NAME=""
4+
ARG NAME=
55
RUN useradd -ms /bin/bash biocbuild && apt update -qq && apt install sudo systemd -y && usermod -aG sudo biocbuild && echo "biocbuild ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
66
USER biocbuild
77
COPY . /home/biocbuild/bioconductor_salt

saltstack/pillar/common/init.sls

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
{% set build_user = grains['cwd'].split("/")[-1] or 'biocbuild' %}
99
{% endif %}
1010

11-
{% if build_user == 'biocbuild' %}
12-
{% endif %}
13-
1411
{% if create_users %}
1512
{% from '../custom/init.sls' import biocbuild_password, biocbuild_key,
1613
biocbuild_authorized_key, biocpush_password, biocpush_key,

saltstack/salt/common/linux.sls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ git_clone_{{ repo.bbs.name }}_to_{{ machine.user.home }}/{{ machine.user.name }}
8787
- user: {{ machine.user.name }}
8888

8989
{%- if machine.gpu %}
90-
{% for pkg_type in ["optional_compile_R", "cran", "bioc"] %}
90+
{% for pkg_type in ["required_compile_R", "optional_compile_R", "cran", "bioc"] %}
9191
install_{{ pkg_type }}_pkgs:
9292
cmd.run:
9393
- name: DEBIAN_FRONTEND=noninteractive apt-get -y install $(cat /home/{{ machine.user.name }}/{{ repo.bbs.name }}/{{ grains["os"] }}-files/{{ grains["osrelease"] }}/apt_{{ pkg_type }}.txt | awk '/^[^#]/ {print $1}')

0 commit comments

Comments
 (0)