Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
docker
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
hepsw
docker
Commits
328eba37
Commit
328eba37
authored
Nov 27, 2019
by
Marian Heil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix wrong env if base not standard dependency
parent
1b06230f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
combine_dockers/combine_dockers.sh
combine_dockers/combine_dockers.sh
+6
-4
install
install
+1
-1
No files found.
combine_dockers/combine_dockers.sh
View file @
328eba37
...
...
@@ -44,10 +44,12 @@ else
declare
-n
dep_dir
=
HEPSW_
${
BASE_NAME
^^
}
_DIR
declare
-n
dep_name
=
HEPSW_
${
BASE_NAME
^^
}
_NAME
base_docker
=
$(
image_name
${
BASE_NAME
}
)
sed
-i
-e
"s#SOURCE#SOURCE
\n
RUN printf
\"
source
${
dep_dir
}
/
${
dep_name
}
dependencies.sh
\\\n\"
>> HEJ_env.sh#g"
\
${
TARGET_DOCKER
}
|
exit
2
sed
-i
-e
"s#SOURCE#SOURCE
\n
RUN printf
\"
source
${
dep_dir
}
/
${
dep_name
}
env.sh
\\\n\"
>> HEJ_env.sh#g"
\
${
TARGET_DOCKER
}
|
exit
2
if
[[
${
dep_dir
}
!=
""
]]
;
then
sed
-i
-e
"s#SOURCE#SOURCE
\n
RUN printf
\"
source
${
dep_dir
}
/
${
dep_name
}
dependencies.sh
\\\n\"
>> HEJ_env.sh#g"
\
${
TARGET_DOCKER
}
|
exit
2
sed
-i
-e
"s#SOURCE#SOURCE
\n
RUN printf
\"
source
${
dep_dir
}
/
${
dep_name
}
env.sh
\\\n\"
>> HEJ_env.sh#g"
\
${
TARGET_DOCKER
}
|
exit
2
fi
fi
echo
"- Using
\"
${
base_docker
}
\"
as base docker"
sed
-i
-e
"s TEMPLATE_BASE
${
base_docker
}
g"
${
TARGET_DOCKER
}
|
exit
2
...
...
install
@
bbced496
Compare
b452d9bb
...
bbced496
Subproject commit b
452d9bbf38c1935d1cdeadd8b132a98453172a5
Subproject commit b
bced496a0b0131a184793589c7888aa48c482d3
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment