diff --git a/CHANGELOG.md b/CHANGELOG.md index a36deaf..590d8cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,9 @@ # Changelog -## 1.0 +## 1.17.6-0 -### 15.09.2023 +### 18.02.2025 -CREATE: +ADD: -* Dockerfile +* packages: curl, jq diff --git a/Dockerfile b/Dockerfile index 5e5ed62..e1cc0d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,39 +1,11 @@ -ARG DOCKER_REGISTRY=harbor.avroid.tech/docker-hub-proxy/library +ARG DOCKER_REGISTRY=harbor.avroid.tech/docker-hub-proxy -# https://hub.docker.com/_/ubuntu -FROM ${DOCKER_REGISTRY}/ubuntu:22.04 -LABEL description="Base build image based on ubuntu 22.04" +ARG IMAGE_TAG -# Disable output interactive dialogs in console for service commands -ENV DEBIAN_FRONTEND=noninteractive +FROM ${DOCKER_REGISTRY}/hashicorp/vault:${IMAGE_TAG} -# Nexus -ARG NEXUS_DOMAIN_NAME="nexus.avroid.tech" -ARG NEXUS_URL="https://${NEXUS_DOMAIN_NAME}" -# swap basic os repos to nexus mirrors https://nexus.avroid.tech -RUN sed -ie "s/deb\ http\:\/\/archive.ubuntu.com\/ubuntu/deb\ [trusted=yes] https\:\/\/${NEXUS_DOMAIN_NAME}\/repository\/mirror-os-apt-ubuntu/g" /etc/apt/sources.list && \ - sed -ie "s/deb\ http\:\/\/security.ubuntu.com\/ubuntu/deb\ [trusted=yes] https\:\/\/${NEXUS_DOMAIN_NAME}\/repository\/mirror-os-apt-ubuntu/g" /etc/apt/sources.list && \ - echo "Acquire::https::${NEXUS_DOMAIN_NAME}::Verify-Peer \"false\";" > /etc/apt/apt.conf.d/99nexus_proxy_cert && \ - apt update && \ - apt install -y ca-certificates && \ - apt update && \ - apt clean && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +RUN apk add curl jq \ + && rm -rf /var/cache/apk/* -ENV TZ="Europe/Moscow" - -# Set timezone on Ubuntu -RUN apt update && \ - apt install -y --no-install-recommends tzdata && \ - ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime && \ - dpkg-reconfigure -f noninteractive tzdata && \ - apt clean && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -# Upgrade OS in container -RUN apt update && \ - apt install -y --no-install-recommends apt-utils && \ - apt dist-upgrade -y && \ - apt clean && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +USER vault diff --git a/Makefile b/Makefile index a67a050..a683f20 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ .PHONY: all build push clean -IMAGE_NAME = template +IMAGE_NAME = vault IMAGE_GROUP = devops -IMAGE_TAG = 1.0 -REVISION = +IMAGE_TAG = 1.17.6 +REVISION = -0 DOCKER_REGISTRY = harbor.avroid.tech CI_FLAGS = diff --git a/README.md b/README.md index d1458ba..134ed7d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -# template-docker-image - -## Данный репозиторий используется как основа для остальных репозиториев +# vault Для сборки образа выполните @@ -13,6 +11,7 @@ make build ```bash make push ``` + Для вывода тега докер образа выполните ```bash