Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
memoriav
Memobase 2020
services
IndexerHelper
Commits
a8a2126c
Unverified
Commit
a8a2126c
authored
Jun 22, 2020
by
Sebastian Schüpbach
Browse files
get ffmpeg and im from official repo
parent
879c1052
Pipeline
#10383
passed with stages
in 20 minutes and 41 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
a8a2126c
...
...
@@ -99,12 +99,12 @@ webservice:test:build:
image
:
docker:stable
services
:
-
docker:dind
before_script
:
-
apk update && apk add curl
#
before_script:
#
- apk update && apk add curl
script
:
-
'
curl
--location
--output
ffprobe
--header
"PRIVATE-TOKEN:
$API_ACCESS_TOKEN"
"https://gitlab.switch.ch/api/v4/projects/937/jobs/artifacts/master/raw/ffmpeg_build/bin/ffprobe?job=snapshot"'
-
'
curl
--location
--output
convert
--header
"PRIVATE-TOKEN:
$API_ACCESS_TOKEN"
"https://gitlab.switch.ch/api/v4/projects/939/jobs/artifacts/master/raw/im_build/bin/convert?job=v6_9_11"'
-
'
curl
--location
--output
identify
--header
"PRIVATE-TOKEN:
$API_ACCESS_TOKEN"
"https://gitlab.switch.ch/api/v4/projects/939/jobs/artifacts/master/raw/im_build/bin/identify?job=v6_9_11"'
#
- 'curl --location --output ffprobe --header "PRIVATE-TOKEN: $API_ACCESS_TOKEN" "https://gitlab.switch.ch/api/v4/projects/937/jobs/artifacts/master/raw/ffmpeg_build/bin/ffprobe?job=snapshot"'
#
- 'curl --location --output convert --header "PRIVATE-TOKEN: $API_ACCESS_TOKEN" "https://gitlab.switch.ch/api/v4/projects/939/jobs/artifacts/master/raw/im_build/bin/convert?job=v6_9_11"'
#
- 'curl --location --output identify --header "PRIVATE-TOKEN: $API_ACCESS_TOKEN" "https://gitlab.switch.ch/api/v4/projects/939/jobs/artifacts/master/raw/im_build/bin/identify?job=v6_9_11"'
-
docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASSWORD" "$REGISTRY"
-
docker build --pull -t "$IMAGE_TAG" -f "$DOCKERFILE" .
-
docker push "$IMAGE_TAG"
...
...
Dockerfile
View file @
a8a2126c
...
...
@@ -24,15 +24,15 @@ COPY --from=histogram_builder /go/src/gitlab.switch.ch/memoriav/memobase-2020/se
RUN
chmod
+x /usr/bin/histogram
RUN
apt-get update
&&
\
apt-get
install
-y
exiftool
&&
\
apt-get
install
-y
exiftool
ffmpeg imagemagick
&&
\
apt-get autoremove
-y
&&
\
apt-get clean
ADD
ffprobe /usr/bin/
ADD
convert /usr/bin/
ADD
identify /usr/bin/
#
ADD ffprobe /usr/bin/
#
ADD convert /usr/bin/
#
ADD identify /usr/bin/
USER
appuser
EXPOSE
8
1
EXPOSE
8
083
ENTRYPOINT
["/app/app"]
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