diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39d007692db358e38a7b0aa6874a7105d5dcb8fa..f1cc8aeb467790b9c7dad6c452a9d60063813175 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,19 @@ build: - docker push $TEST_IMAGE - docker tag $TEST_IMAGE $TEST_IMAGE_SHA - docker push $TEST_IMAGE_SHA +build-x86: + stage: build + tags: + - dell + services: + - docker:dind + before_script: + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.vereign.com + script: + - docker build --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA --build-arg CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME --build-arg CI_PROJECT_NAME=$CI_PROJECT_NAME --build-arg CI_JOB_TOKEN=$CI_JOB_TOKEN --pull -t $TEST_IMAGE-x86 -f Dockerfile-x86 . + - docker push $TEST_IMAGE-x86 + - docker tag $TEST_IMAGE-x86 $TEST_IMAGE_SHA-x86 + - docker push $TEST_IMAGE_SHA-x86 deploy: stage: deploy tags: diff --git a/Dockerfile-x86 b/Dockerfile-x86 new file mode 100644 index 0000000000000000000000000000000000000000..27220b526713cb61b4c29bef5171ff48231020de --- /dev/null +++ b/Dockerfile-x86 @@ -0,0 +1,35 @@ +FROM registry.vereign.com/docker/go-with-dep:master-x86 + +#RUN echo deb http://deb.debian.org/debian buster main > /etc/apt/sources.list.d/buster.list \ +# && apt-get update \ +# && apt-get install -y --no-install-recommends npm zlib1g-dev + +ENV GOPATH /srv/ +ENV SERVER_OUT "bin/server" +ENV SERVER_PKG_BUILD ${PKG} + +ARG CI_JOB_TOKEN +ARG CI_PROJECT_NAME +ARG CI_COMMIT_REF_NAME +ARG CI_COMMIT_SHA + +ENV CI_PROJECT_NAME ${CI_PROJECT_NAME} + +RUN echo project is $CI_PROJECT_NAME && mkdir -p /srv/src/code.vereign.com/code/$CI_PROJECT_NAME + +COPY . /srv/src/code.vereign.com/code/$CI_PROJECT_NAME/ + +RUN cd /srv/src/code.vereign.com/code/$CI_PROJECT_NAME && \ + git config --global credential.https://code.vereign.com.username gitlab-ci-token && \ + git config --global credential.helper "store --file /tmp/store" && \ + echo https://gitlab-ci-token:$CI_JOB_TOKEN@code.vereign.com > /tmp/store && cat /tmp/store && \ + export PKG=code.vereign.com/code/$CI_PROJECT_NAME && \ + make && rm /tmp/store + +#FROM debian:stretch +#RUN mkdir -p /srv/src/code.vereign.com/code/ +#COPY --from=0 /srv/src/code.vereign.com/code/data-storage-agent /srv/src/code.vereign.com/code/ +#RUN find /srv/src/code.vereign.com/code/ + +ENTRYPOINT /srv/src/code.vereign.com/code/$CI_PROJECT_NAME/bin/server +