Skip to content
Snippets Groups Projects
Commit 61825326 authored by Grzegorz Mirek's avatar Grzegorz Mirek
Browse files

chore: update base image to ubuntu22.04-11, postgresql to v.16.2, pycharm to...

chore: update base image to ubuntu22.04-11, postgresql to v.16.2, pycharm to v.2024.1, VSC to 1.88.1
parent 10a858c4
No related branches found
No related tags found
1 merge request!7add noVNC and GUI
# docker build --target=haf-builder -t ${REGISTRY}hive-builder:ubuntu22.04-7 -f Dockerfile.builder .
# docker build --target=haf-builder -t ${REGISTRY}hive-builder:ubuntu22.04-11 -f Dockerfile.builder .
ARG CI_REGISTRY_IMAGE=registry.gitlab.syncad.com/hive/haf/
ARG CI_IMAGE_TAG=:ubuntu22.04-7
ARG CI_IMAGE_TAG=:ubuntu22.04-11
FROM ${CI_REGISTRY_IMAGE}ci-base-image$CI_IMAGE_TAG AS haf-builder
......@@ -65,7 +65,7 @@ RUN cd /home/${DEFAULT_USER} \
&& sudo apt-get install -y ./code_x64.deb \
&& rm code_x64.deb \
&& mkdir pycharm \
&& wget -qO- 'https://download.jetbrains.com/python/pycharm-community-2023.3.3.tar.gz' | tar -xz -C pycharm --strip-components=1 \
&& wget -qO- 'https://download.jetbrains.com/python/pycharm-community-2024.1.tar.gz' | tar -xz -C pycharm --strip-components=1 \
&& sudo rm -rf /var/lib/apt/lists/*
ADD configs/Desktop.tar.gz .
......
......@@ -4,7 +4,7 @@ HOST_USER=$(whoami)
DOCKER_GROUP=$(getent group docker | cut -d: -f3)
CI_IMAGE_TAG=:ubuntu22.04-7
CI_IMAGE_TAG=:ubuntu22.04-11
docker build --target=haf-builder --build-arg CI_REGISTRY_IMAGE=registry.gitlab.syncad.com/hive/haf/ \
--build-arg CI_IMAGE_TAG=${CI_IMAGE_TAG} \
......@@ -13,11 +13,3 @@ docker build --target=haf-builder --build-arg CI_REGISTRY_IMAGE=registry.gitlab.
--build-arg DEFAULT_USER_GID=$(id -g ${HOST_USER}) \
--build-arg DOCKER_GROUP=${DOCKER_GROUP} \
-t registry.gitlab.syncad.com/hive/haf/haf-builder${CI_IMAGE_TAG} -f Dockerfile.builder .
# docker build --target=desktop-haf-builder --build-arg CI_REGISTRY_IMAGE=registry.gitlab.syncad.com/hive/haf/ \
# --build-arg CI_IMAGE_TAG=${CI_IMAGE_TAG} \
# --build-arg DEFAULT_USER=haf_admin \
# --build-arg DEFAULT_USER_UID=$(id -u ${HOST_USER}) \
# --build-arg DEFAULT_USER_GID=$(id -g ${HOST_USER}) \
# --build-arg DOCKER_GROUP=${DOCKER_GROUP} \
# -t registry.gitlab.syncad.com/hive/haf/desktop-haf-builder${CI_IMAGE_TAG} -f Dockerfile.builder .
\ No newline at end of file
File deleted
......@@ -7,4 +7,4 @@ docker run -dti --restart always --init --pid=host --name haf-builder \
--cap-add=SYS_PTRACE \
--cap-add=SYS_ADMIN \
--shm-size 1073741824 \
registry.gitlab.syncad.com/hive/haf/haf-builder:ubuntu22.04-7
registry.gitlab.syncad.com/hive/haf/haf-builder:ubuntu22.04-11
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment