Skip to content

Commit

Permalink
Update poetry to specific version in image
Browse files Browse the repository at this point in the history
  • Loading branch information
raidgar98 committed Aug 10, 2023
1 parent 0f93e50 commit a9ef8b7
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ variables:
GIT_SUBMODULE_STRATEGY: recursive
CI_DEBUG_SERVICES: "true"
# pin to specific docker images for build repeatability
# uses registry.gitlab.syncad.com/hive/hive/ci-base-image:ubuntu22.04-5
TEST_IMAGE_TAG: "@sha256:eaa6f32730f0f4c45a95a65b6d790bea2b71a59276eb28795c04be7703f003e6"
# uses registry.gitlab.syncad.com/hive/hive/ci-base-image:ubuntu22.04-6
TEST_IMAGE_TAG: "@sha256:8132802ca3b7ddba1bf78e4cc5ce1fbda6874cb029e35ae855c4cb3443e477b7"

# uses registry.gitlab.syncad.com/hive/common-ci-configuration/emsdk:1d271c28906d267c1172641bb2aa42727f16b513
EMSCRIPTEN_IMAGE_TAG: "@sha256:14287297ffbb7a55d134f1ab326f67aa8b387151f5118b21bf68e74ff1d437ed"
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# Modify CI_IMAGE_TAG here and inside script hive/scripts/ci-helpers/build_ci_base_images.sh and run it. Then push images to registry
# To be started from cloned haf source directory.
ARG CI_REGISTRY_IMAGE=registry.gitlab.syncad.com/hive/hive/
ARG CI_IMAGE_TAG=:ubuntu22.04-5
ARG CI_IMAGE_TAG=:ubuntu22.04-6
ARG BUILD_IMAGE_TAG

FROM phusion/baseimage:jammy-1.0.1 AS runtime

ENV LANG=en_US.UTF-8

SHELL ["/bin/bash", "-c"]
SHELL ["/bin/bash", "-c"]

USER root
WORKDIR /usr/local/src
Expand All @@ -26,7 +26,7 @@ FROM ${CI_REGISTRY_IMAGE}runtime$CI_IMAGE_TAG AS ci-base-image
ENV LANG=en_US.UTF-8
ENV PATH="/home/hived_admin/.local/bin:$PATH"

SHELL ["/bin/bash", "-c"]
SHELL ["/bin/bash", "-c"]

USER root
WORKDIR /usr/local/src
Expand Down Expand Up @@ -60,7 +60,7 @@ ENV HIVE_LINT=${HIVE_LINT}

USER hived_admin
WORKDIR /home/hived_admin
SHELL ["/bin/bash", "-c"]
SHELL ["/bin/bash", "-c"]

# Get everything from cwd as sources to be built.
COPY --chown=hived_admin:users . /home/hived_admin/hive
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci-helpers/build_ci_base_image.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /bin/bash

REGISTRY=${1:-registry.gitlab.syncad.com/hive/hive/}
CI_IMAGE_TAG=:ubuntu22.04-5
CI_IMAGE_TAG=:ubuntu22.04-6

docker buildx build --progress=plain --target=runtime \
--build-arg CI_REGISTRY_IMAGE=$REGISTRY --build-arg CI_IMAGE_TAG=$CI_IMAGE_TAG \
Expand Down
3 changes: 2 additions & 1 deletion scripts/setup_ubuntu.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/bash

set -euo pipefail
set -euo pipefail

# Script purpose is an installation of all packages required to build and run Hived instance.
# After changing it, please also update and push to the registry a docker image defined in https://gitlab.syncad.com/hive/hive/-/blob/develop/Dockerfile
Expand Down Expand Up @@ -87,6 +87,7 @@ install_user_packages() {
popd

curl -sSL https://install.python-poetry.org | python3 - # install poetry in an isolated environment
poetry self update 1.5.1
}

create_hived_admin_account() {
Expand Down

0 comments on commit a9ef8b7

Please sign in to comment.