In order to mitigate against the brute force attacks against Gitlab accounts, we are moving to all edu-ID Logins. We would like to remind you to link your account with your edu-id. Login will be possible only by edu-ID after November 30, 2021. Here you can find the instructions for linking your account.

If you don't have a SWITCH edu-ID, you can create one with this guide here

kind regards

Unverified Commit b8a5f8d6 authored by Sebastian Schüpbach's avatar Sebastian Schüpbach
Browse files

change paths

parent 19abd55c
Pipeline #10351 failed with stages
in 33 seconds
...@@ -4,56 +4,95 @@ stages: ...@@ -4,56 +4,95 @@ stages:
variables: variables:
DOCKER_TLS_CERTDIR: "" DOCKER_TLS_CERTDIR: ""
PKG_PATH: gitlab.switch.ch/memoriav/memobase-2020/services/histogram/cmd/webservice
default: default:
image: golang:1.14 image: golang:1.14
.test_setup: &test_setup .test_setup: &test_setup
- mkdir -p /go/src/gitlab.switch.ch/memoriav/memobase-2020/services/histogram - mkdir -p /go/src/gitlab.switch.ch/${CI_PROJECT_NAMESPACE}
- ln -s $CI_PROJECT_DIR /go/src/gitlab.switch.ch/memoriav/memobase-2020/services/histogram - ln -s $CI_PROJECT_DIR /go/src/gitlab.switch.ch/memoriav/memobase-2020/services/histogram
- cd /go/src/gitlab.switch.ch/memoriav/memobase-2020/services/histogram - cd /go/src/gitlab.switch.ch/memoriav/memobase-2020/services/histogram
indexer:lint: .test:lint:
stage: test stage: test
tags: [mbr] tags: [mbr]
before_script: before_script:
- *test_setup - *test_setup
- go get -u golang.org/x/lint/golint - go get -u golang.org/x/lint/golint
script: script:
- golint -set_exit_status $PKG_PATH - golint -set_exit_status $BIN_PATH
allow_failure: true allow_failure: true
indexer:unit: .test:unit:
stage: test stage: test
tags: [mbr] tags: [mbr]
before_script: [*test_setup] before_script: [*test_setup]
script: script:
- go test -short $PKG_PATH - go test -short $BIN_PATH
allow_failure: true allow_failure: true
indexer:race: .test:race:
stage: test stage: test
tags: [mbr] tags: [mbr]
before_script: [*test_setup] before_script: [*test_setup]
script: script:
- go test -race -short $PKG_PATH - go test -race -short $BIN_PATH
allow_failure: true allow_failure: true
#indexer:msan: #test:msan:
# stage: test # stage: test
# tags: [mbr] # tags: [mbr]
# before_script: [*test_setup] # before_script: [*test_setup]
# script: # script:
# - go test -msan -short $PKG_PATH # - go test -msan -short $BIN_PATH
# allow_failure: true # allow_failure: true
indexer:build: .test:build:
stage: test stage: test
tags: [mbr] tags: [mbr]
before_script: [*test_setup] before_script: [*test_setup]
script: script:
- go build $PKG_PATH - go build $BIN_PATH
histogram:test:lint:
extends: .test:lint
variables:
BIN_PATH: gitlab.switch.ch/memoriav/memobase-2020/services/histogram/cmd/histogram
histogram:test:unit:
extends: .test:unit
variables:
BIN_PATH: gitlab.switch.ch/memoriav/memobase-2020/services/histogram/cmd/histogram
histogram:test:race:
extends: .test:race
variables:
BIN_PATH: gitlab.switch.ch/memoriav/memobase-2020/services/histogram/cmd/histogram
histogram:test:build:
extends: .test:build
variables:
BIN_PATH: gitlab.switch.ch/memoriav/memobase-2020/services/histogram/cmd/histogram
webservice:test:lint:
extends: .test:lint
variables:
BIN_PATH: gitlab.switch.ch/memoriav/memobase-2020/services/webservice/cmd/webservice
webservice:test:unit:
extends: .test:unit
variables:
BIN_PATH: gitlab.switch.ch/memoriav/memobase-2020/services/webservice/cmd/webservice
webservice:test:race:
extends: .test:race
variables:
BIN_PATH: gitlab.switch.ch/memoriav/memobase-2020/services/webservice/cmd/webservice
webservice:test:build:
extends: .test:build
variables:
BIN_PATH: gitlab.switch.ch/memoriav/memobase-2020/services/webservice/cmd/webservice
.build-image: .build-image:
stage: publish stage: publish
...@@ -71,7 +110,7 @@ indexer:build: ...@@ -71,7 +110,7 @@ indexer:build:
- docker push "$IMAGE_TAG" - docker push "$IMAGE_TAG"
- docker logout - docker logout
indexer:build-tagged-image: indexerhelper:build-tagged-image:
extends: .build-image extends: .build-image
variables: variables:
IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
...@@ -82,7 +121,7 @@ indexer:build-tagged-image: ...@@ -82,7 +121,7 @@ indexer:build-tagged-image:
only: only:
- tags - tags
indexer:build-latest-image: indexerhelper:build-latest-image:
extends: .build-image extends: .build-image
variables: variables:
IMAGE_TAG: "$CI_REGISTRY_IMAGE:latest" IMAGE_TAG: "$CI_REGISTRY_IMAGE:latest"
...@@ -93,7 +132,7 @@ indexer:build-latest-image: ...@@ -93,7 +132,7 @@ indexer:build-latest-image:
only: only:
- master - master
indexer:build-feature-branch-image: indexerhelper:build-feature-branch-image:
extends: .build-image extends: .build-image
variables: variables:
IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
......
...@@ -6,11 +6,21 @@ COPY . . ...@@ -6,11 +6,21 @@ 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
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/github.com/je4/indexer/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/app /usr/bin
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y exiftool && \ apt-get install -y exiftool && \
......
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