From e0e86ec1d3d74ea977e6336a84fefd309bef8497 Mon Sep 17 00:00:00 2001 From: pokeeffe-molecula Date: Mon, 24 Jan 2022 18:34:14 -0600 Subject: [PATCH 1/5] put docker containers in the right place --- .gitlab/.gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 30695ad6c..2a5fcb04e 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -229,7 +229,7 @@ build amd container fb: before_script: - echo "${DOCKER_DEPLOY_TOKEN}" | docker login -u ${DOCKER_DEPLOY_USER} --password-stdin ${CI_REGISTRY} script: - - tag=${CI_REGISTRY_IMAGE}/server:${CI_COMMIT_REF_SLUG} + - tag=${CI_REGISTRY_IMAGE}/featurebase:linux-amd64-${CI_COMMIT_REF_SLUG} - docker build --build-arg GO_VERSION=$GOVERSION --build-arg ARCH=amd64 -t $tag -f .gitlab/Dockerfile . - docker push $tag - echo Created docker featurebase image with tag "$tag" @@ -245,7 +245,7 @@ build arm container fb: before_script: - echo "${DOCKER_DEPLOY_TOKEN}" | docker login -u ${DOCKER_DEPLOY_USER} --password-stdin ${CI_REGISTRY} script: - - tag=${CI_REGISTRY_IMAGE}/server-arm:${CI_COMMIT_REF_SLUG} + - tag=${CI_REGISTRY_IMAGE}/featurebase:linux-arm64-${CI_COMMIT_REF_SLUG} - docker build --build-arg GO_VERSION=$GOVERSION --build-arg ARCH=arm64 -t $tag -f .gitlab/Dockerfile . - docker push $tag - echo Created docker featurebase image with tag "$tag" From 0f5ce612e06753e0b94a63a1fecdbc89778ead91 Mon Sep 17 00:00:00 2001 From: pokeeffe-molecula Date: Thu, 27 Jan 2022 09:39:34 -0600 Subject: [PATCH 2/5] building roaring-migrate for linux_amd64 --- .gitlab/.gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index c71a96d64..8d7dab751 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -135,9 +135,12 @@ build for linux amd64: - go get -v -u github.com/rakyll/statik - /go/bin/statik -src=lattice - GOOS="linux" GOARCH="amd64" make build FLAGS="-o featurebase_linux_amd64" + - GOOS=linux GOARCH=arm64 go build ./cmd/roaring-migrate + - cp ./cmd/roaring-migrate ./roaring-migrate_linux_amd64 artifacts: paths: - featurebase_linux_amd64 + - roaring-migrate_linux_amd64 build for linux arm64: stage: build From 5d7c2437e9ed7053ae46e539f6af4cab2190b305 Mon Sep 17 00:00:00 2001 From: pokeeffe-molecula Date: Thu, 27 Jan 2022 10:00:22 -0600 Subject: [PATCH 3/5] trying again --- .gitlab/.gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 8d7dab751..0a8ed5920 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -135,8 +135,8 @@ build for linux amd64: - go get -v -u github.com/rakyll/statik - /go/bin/statik -src=lattice - GOOS="linux" GOARCH="amd64" make build FLAGS="-o featurebase_linux_amd64" - - GOOS=linux GOARCH=arm64 go build ./cmd/roaring-migrate - - cp ./cmd/roaring-migrate ./roaring-migrate_linux_amd64 + - GOOS="linux" GOARCH="amd64" go build ./cmd/roaring-migrate + - mv ./roaring-migrate ./roaring-migrate_linux_amd64 artifacts: paths: - featurebase_linux_amd64 From dff061ca2233e60bd68178ee7e9ce774a3dee5d6 Mon Sep 17 00:00:00 2001 From: pokeeffe-molecula Date: Thu, 27 Jan 2022 10:18:21 -0600 Subject: [PATCH 4/5] now do it for the other one --- .gitlab/.gitlab-ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 0a8ed5920..ad7b827f1 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -153,9 +153,12 @@ build for linux arm64: - go get -v -u github.com/rakyll/statik - /go/bin/statik -src=lattice - GOOS="linux" GOARCH="arm64" make build FLAGS="-o featurebase_linux_arm64" + - GOOS="linux" GOARCH="arm64" go build ./cmd/roaring-migrate + - mv ./roaring-migrate ./roaring-migrate_linux_arm64 artifacts: paths: - featurebase_linux_arm64 + - roaring-migrate_linux_arm64 build for darwin amd64: stage: build @@ -168,9 +171,12 @@ build for darwin amd64: - go get -v -u github.com/rakyll/statik - /go/bin/statik -src=lattice - GOOS="darwin" GOARCH="amd64" make build FLAGS="-o featurebase_darwin_amd64" + - GOOS="darwin" GOARCH="amd64" go build ./cmd/roaring-migrate + - mv ./roaring-migrate ./roaring-migrate_darwin_amd64 artifacts: paths: - featurebase_darwin_amd64 + - roaring-migrate_darwin_amd64 build for darwin arm64: stage: build @@ -183,9 +189,12 @@ build for darwin arm64: - go get -v -u github.com/rakyll/statik - /go/bin/statik -src=lattice - GOOS="darwin" GOARCH="arm64" make build FLAGS="-o featurebase_darwin_arm64" + - GOOS="darwin" GOARCH="arm64" go build ./cmd/roaring-migrate + - mv ./roaring-migrate ./roaring-migrate_darwin_arm64 artifacts: paths: - featurebase_darwin_arm64 + - roaring-migrate_darwin_arm64 package for linux amd64: stage: build From d16ada75af819be4f6c4d938f494b66789b22007 Mon Sep 17 00:00:00 2001 From: pokeeffe-molecula Date: Thu, 27 Jan 2022 11:36:16 -0600 Subject: [PATCH 5/5] use -o instead of a subsequent mv command --- .gitlab/.gitlab-ci.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index ad7b827f1..f130aebd0 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -135,8 +135,7 @@ build for linux amd64: - go get -v -u github.com/rakyll/statik - /go/bin/statik -src=lattice - GOOS="linux" GOARCH="amd64" make build FLAGS="-o featurebase_linux_amd64" - - GOOS="linux" GOARCH="amd64" go build ./cmd/roaring-migrate - - mv ./roaring-migrate ./roaring-migrate_linux_amd64 + - GOOS="linux" GOARCH="amd64" go build -o roaring-migrate_linux_amd64 ./cmd/roaring-migrate artifacts: paths: - featurebase_linux_amd64 @@ -153,8 +152,7 @@ build for linux arm64: - go get -v -u github.com/rakyll/statik - /go/bin/statik -src=lattice - GOOS="linux" GOARCH="arm64" make build FLAGS="-o featurebase_linux_arm64" - - GOOS="linux" GOARCH="arm64" go build ./cmd/roaring-migrate - - mv ./roaring-migrate ./roaring-migrate_linux_arm64 + - GOOS="linux" GOARCH="arm64" go build -o roaring-migrate_linux_arm64 ./cmd/roaring-migrate artifacts: paths: - featurebase_linux_arm64 @@ -171,8 +169,7 @@ build for darwin amd64: - go get -v -u github.com/rakyll/statik - /go/bin/statik -src=lattice - GOOS="darwin" GOARCH="amd64" make build FLAGS="-o featurebase_darwin_amd64" - - GOOS="darwin" GOARCH="amd64" go build ./cmd/roaring-migrate - - mv ./roaring-migrate ./roaring-migrate_darwin_amd64 + - GOOS="darwin" GOARCH="amd64" go build -o roaring-migrate_darwin_amd64 ./cmd/roaring-migrate artifacts: paths: - featurebase_darwin_amd64 @@ -189,8 +186,7 @@ build for darwin arm64: - go get -v -u github.com/rakyll/statik - /go/bin/statik -src=lattice - GOOS="darwin" GOARCH="arm64" make build FLAGS="-o featurebase_darwin_arm64" - - GOOS="darwin" GOARCH="arm64" go build ./cmd/roaring-migrate - - mv ./roaring-migrate ./roaring-migrate_darwin_arm64 + - GOOS="darwin" GOARCH="arm64" go build -o roaring-migrate_darwin_arm64 ./cmd/roaring-migrate artifacts: paths: - featurebase_darwin_arm64