Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Spack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eic_tools
Spack
Commits
c2529358
Commit
c2529358
authored
6 years ago
by
Omar Padron
Committed by
Todd Gamblin
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fix archlinux docker build (#10289)
parent
c63c4a04
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
share/spack/docker/Dockerfile
+6
-5
6 additions, 5 deletions
share/spack/docker/Dockerfile
share/spack/docker/config/arch.bash
+1
-3
1 addition, 3 deletions
share/spack/docker/config/arch.bash
with
7 additions
and
8 deletions
share/spack/docker/Dockerfile
+
6
−
5
View file @
c2529358
...
@@ -25,11 +25,12 @@ RUN mkdir -p $SPACK_ROOT/opt/spack
...
@@ -25,11 +25,12 @@ RUN mkdir -p $SPACK_ROOT/opt/spack
MASK PUSH
MASK PUSH
MASK [[ $DISTRO == arch ]]
MASK [[ $DISTRO == arch ]]
RUN
pacman
-Sy
--noconfirm
\
RUN
pacman
-Syu
--noconfirm
\
base-devel ca-certificates curl gcc
\
&&
pacman
-Sy
--noconfirm
\
gcc-fortran git gnupg2 iproute2
\
base-devel ca-certificates curl gcc
\
make openssh python python-pip
\
gcc-fortran git gnupg2 inetutils
\
sudo
tcl
\
iproute2 make openssh procps-ng
\
python python-pip
sudo
tcl
\
&&
echo
'nobody ALL=(ALL) NOPASSWD: ALL'
>
\
&&
echo
'nobody ALL=(ALL) NOPASSWD: ALL'
>
\
/etc/sudoers.d/nobody-sudo
\
/etc/sudoers.d/nobody-sudo
\
&&
sudo
-u
nobody git clone
\
&&
sudo
-u
nobody git clone
\
...
...
This diff is collapsed.
Click to expand it.
share/spack/docker/config/arch.bash
+
1
−
3
View file @
c2529358
...
@@ -11,8 +11,6 @@ unset BASE_TAG
...
@@ -11,8 +11,6 @@ unset BASE_TAG
unset
TAG
unset
TAG
unset
EXTRA_TAGS
unset
EXTRA_TAGS
export
BASE_IMAGE
=
"
base/
archlinux"
export
BASE_IMAGE
=
"archlinux
/base
"
export
BASE_NAME
=
"archlinux"
export
BASE_NAME
=
"archlinux"
export
BASE_TAG
=
"2018.10.01"
export
DISTRO
=
"arch"
export
DISTRO
=
"arch"
export
EXTRA_TAGS
=
"latest"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment