Commit 8a87cb6e authored by Jürgen Enge's avatar Jürgen Enge
Browse files

Merge branch 'master' of gitlab.switch.ch:memoriav/memobase-2020/services/histogram

parents 1b9308fa 954ca5b7
Pipeline #10494 passed with stages
in 19 minutes and 25 seconds
...@@ -59,10 +59,10 @@ histogram:test:lint: ...@@ -59,10 +59,10 @@ histogram:test:lint:
variables: variables:
BIN_PATH: gitlab.switch.ch/memoriav/memobase-2020/services/histogram/cmd/histogram BIN_PATH: gitlab.switch.ch/memoriav/memobase-2020/services/histogram/cmd/histogram
histogram:test:unit: # histogram:test:unit:
extends: .test:unit # extends: .test:unit
variables: # variables:
BIN_PATH: gitlab.switch.ch/memoriav/memobase-2020/services/histogram/cmd/histogram # BIN_PATH: gitlab.switch.ch/memoriav/memobase-2020/services/histogram/cmd/histogram
histogram:test:race: histogram:test:race:
extends: .test:race extends: .test:race
...@@ -79,10 +79,10 @@ webservice:test:lint: ...@@ -79,10 +79,10 @@ webservice:test:lint:
variables: variables:
BIN_PATH: gitlab.switch.ch/memoriav/memobase-2020/services/histogram/cmd/webservice BIN_PATH: gitlab.switch.ch/memoriav/memobase-2020/services/histogram/cmd/webservice
webservice:test:unit: # webservice:test:unit:
extends: .test:unit # extends: .test:unit
variables: # variables:
BIN_PATH: gitlab.switch.ch/memoriav/memobase-2020/services/histogram/cmd/webservice # BIN_PATH: gitlab.switch.ch/memoriav/memobase-2020/services/histogram/cmd/webservice
webservice:test:race: webservice:test:race:
extends: .test:race extends: .test:race
......
...@@ -6,22 +6,13 @@ COPY . . ...@@ -6,22 +6,13 @@ COPY . .
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/app -a gitlab.switch.ch/memoriav/memobase-2020/services/histogram/cmd/webservice RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/app -a gitlab.switch.ch/memoriav/memobase-2020/services/histogram/cmd/webservice
FROM golang:1.14 as histogram_builder
RUN adduser --system appuser
WORKDIR $GOPATH/src/gitlab.switch.ch/memoriav/memobase-2020/services/histogram
COPY . .
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/histogram -a gitlab.switch.ch/memoriav/memobase-2020/services/histogram/cmd/histogram
FROM perl:5.30-slim-buster FROM perl:5.30-slim-buster
WORKDIR /app WORKDIR /app
RUN mkdir /app/colormap && \
chmod -R 777 /app/colormap
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder /go/src/gitlab.switch.ch/memoriav/memobase-2020/services/histogram/bin/app /app COPY --from=builder /go/src/gitlab.switch.ch/memoriav/memobase-2020/services/histogram/bin/app /app
COPY --from=builder /etc/passwd /etc/passwd COPY --from=builder /etc/passwd /etc/passwd
COPY --from=histogram_builder /go/src/gitlab.switch.ch/memoriav/memobase-2020/services/histogram/bin/histogram /usr/bin
RUN chmod +x /usr/bin/histogram
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y exiftool ffmpeg imagemagick && \ apt-get install -y exiftool ffmpeg imagemagick && \
......
...@@ -25,11 +25,16 @@ spec: ...@@ -25,11 +25,16 @@ spec:
protocol: TCP protocol: TCP
imagePullPolicy: Always imagePullPolicy: Always
volumeMounts: volumeMounts:
- name: tmp-volume
mountPath: /tmp
- name: config - name: config
mountPath: /app/configs mountPath: /app/configs
command: ["/app/app", "-cfg", "/app/configs/histogram.toml"] command: ["/app/app", "-cfg", "/app/configs/histogram.toml"]
restartPolicy: Always restartPolicy: Always
volumes: volumes:
- name: tmp-volume
persistentVolumeClaim:
claimName: indexer-volume-claim
- name: config - name: config
configMap: configMap:
name: indexer-helper-config name: indexer-helper-config
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