Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hcana
Manage
Activity
Members
Labels
Plan
Issues
6
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
jlab
hallc
analyzer_software
hcana
Commits
efe16001
Commit
efe16001
authored
5 years ago
by
Sylvester Joosten
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of gitlab.com:hallc/analyzer_software/hcana
parents
95331d70
376fc309
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
containers/docker/Dockerfile
+2
-1
2 additions, 1 deletion
containers/docker/Dockerfile
containers/docker/config.env
+4
-4
4 additions, 4 deletions
containers/docker/config.env
with
6 additions
and
5 deletions
containers/docker/Dockerfile
+
2
−
1
View file @
efe16001
FROM
hallac/root_base:latest
FROM
eicweb.phy.anl.gov:4567/containers/image_recipes/root_base:latest
LABEL
maintainer "Whitney Armstrong <warmstrong@anl.gov>"
#
...
...
This diff is collapsed.
Click to expand it.
containers/docker/config.env
+
4
−
4
View file @
efe16001
...
...
@@ -12,10 +12,10 @@ ALT_NAME ?= broadwell
APP_NAME = hcana
REPO_NAME = hallac
DH_ORG = hallac
GL_GROUP = jlab
GL_REG_GROUP = jlab
GL_REG_NAME =
$(REG_NAME)
REPO =
$(REG_USER)
GL_GROUP = jlab
/hallc/analyzer_software
GL_REG_GROUP = jlab
/hallc/analyzer_software
GL_REG_NAME =
hcana
REPO =
hcana
TAG_VERSION = 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