Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
s1tiling-dockers
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
s1-tiling
s1tiling-dockers
Commits
28f64588
Commit
28f64588
authored
9 months ago
by
fabien contival
Browse files
Options
Downloads
Patches
Plain Diff
Fix Dockerfile for otb<9 + Add --no-cache option
parent
fbd29200
No related branches found
No related tags found
1 merge request
!7
Resolve "Integrate Gamma0 RTC into dockers"
Pipeline
#15508
failed
9 months ago
Stage: build-base
Stage: build-dev
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scripts/build-dockers.sh
+1
-1
1 addition, 1 deletion
scripts/build-dockers.sh
ubuntu/base/Dockerfile
+2
-2
2 additions, 2 deletions
ubuntu/base/Dockerfile
with
3 additions
and
3 deletions
scripts/build-dockers.sh
+
1
−
1
View file @
28f64588
...
...
@@ -465,7 +465,7 @@ if _is_set user_dir ; then
args
=(
$(
_replace_in_array
CI_COMMIT_SHA
=
CI_COMMIT_SHA
=
"
$(
cd
"
${
wrk_dir
}
"
&&
_git_sha
)
"
"
${
args
[@]
}
"
)
)
(
_execute
cd
"
${
wrk_dir
}
"
&&
# _execute docker build -t "${dest_repository}/s1tiling:${S1TILING_VERSION}-${OS}-otb${OTB_VERSION}" "${args[@]}" -f "docker/${DOCKERFILE_NAME}" .)
_execute docker build
-t
"
${
dest_repository
}
/s1tiling:
${
S1TILING_VERSION
}
-
${
OS
}
-otb
${
OTB_VERSION
}
"
"
${
args
[@]
}
"
-f
"
${
step_dockerfile
[
"
${
step
}
"
]
}
"
.
)
_execute docker build
--no-cache
-t
"
${
dest_repository
}
/s1tiling:
${
S1TILING_VERSION
}
-
${
OS
}
-otb
${
OTB_VERSION
}
"
"
${
args
[@]
}
"
-f
"
${
step_dockerfile
[
"
${
step
}
"
]
}
"
.
)
# _execute docker build -t "${dest_repository}/s1tiling:${S1TILING_VERSION}-${OS}-otb${OTB_VERSION}" "${args[@]}" .)
fi
...
...
This diff is collapsed.
Click to expand it.
ubuntu/base/Dockerfile
+
2
−
2
View file @
28f64588
...
...
@@ -133,7 +133,7 @@ RUN uname -a \
&&
make
&&
make
install
\
&&
mv
"
${
OTB_INSTALL_DIRNAME
}
/lib"
/otbapp_
*
.so
"
${
OTB_INSTALL_DIRNAME
}
/lib/otb/applications"
\
&&
cd
/tmp
\
&&
rm
-r
/tmp/
*
\
&&
rm
-r
normlim_sigma0
\
\
&&
git clone https://
{
user
}
:
{
token
}
@gitlab.orfeo-toolbox.org/s1-tiling/gamma0-rtc.git
\
&&
cd
/tmp/gamma0-rtc
\
...
...
@@ -147,7 +147,7 @@ RUN uname -a \
&&
make
&&
make
install
\
&&
mv
"
${
OTB_INSTALL_DIRNAME
}
/lib"
/otbapp_
*
.so
"
${
OTB_INSTALL_DIRNAME
}
/lib/otb/applications"
\
&&
cd
/tmp
\
&&
rm
-r
/tmp/
*
\
&&
rm
-r
gamma0-rtc
\
\
&&
rm
-r
"
${
OTB_INSTALL_DIRNAME
}
/share/otb/swig/build"
\
&&
rm
-r
"
${
OTB_INSTALL_DIRNAME
}
/bin/otbgui"
*
\
...
...
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