Unverified Commit a8a2126c authored by Sebastian Schüpbach's avatar 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
...@@ -99,12 +99,12 @@ webservice:test:build: ...@@ -99,12 +99,12 @@ webservice:test:build:
image: docker:stable image: docker:stable
services: services:
- docker:dind - docker:dind
before_script: # before_script:
- apk update && apk add curl # - apk update && apk add curl
script: 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 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 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 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 login -u "$REGISTRY_USER" -p "$REGISTRY_PASSWORD" "$REGISTRY"
- docker build --pull -t "$IMAGE_TAG" -f "$DOCKERFILE" . - docker build --pull -t "$IMAGE_TAG" -f "$DOCKERFILE" .
- docker push "$IMAGE_TAG" - docker push "$IMAGE_TAG"
......
...@@ -24,15 +24,15 @@ COPY --from=histogram_builder /go/src/gitlab.switch.ch/memoriav/memobase-2020/se ...@@ -24,15 +24,15 @@ COPY --from=histogram_builder /go/src/gitlab.switch.ch/memoriav/memobase-2020/se
RUN chmod +x /usr/bin/histogram RUN chmod +x /usr/bin/histogram
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y exiftool && \ apt-get install -y exiftool ffmpeg imagemagick && \
apt-get autoremove -y && \ apt-get autoremove -y && \
apt-get clean apt-get clean
ADD ffprobe /usr/bin/ # ADD ffprobe /usr/bin/
ADD convert /usr/bin/ # ADD convert /usr/bin/
ADD identify /usr/bin/ # ADD identify /usr/bin/
USER appuser USER appuser
EXPOSE 81 EXPOSE 8083
ENTRYPOINT ["/app/app"] ENTRYPOINT ["/app/app"]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment