diff --git a/CHANGELOG.md b/CHANGELOG.md index a36deaf..9da5de6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,9 @@ -# Changelog +doxygen/1.9.8 -## 1.0 +### 04.02.2025 -### 15.09.2023 +Install: -CREATE: - -* Dockerfile +- doxygen +- openjdk version "21.0.5" +- plantuml v1.2025.0 diff --git a/Dockerfile b/Dockerfile index 5e5ed62..8f46ca7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,12 @@ -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" +FROM ${DOCKER_REGISTRY}/ubuntu:24.04 +LABEL description="Base build image based on ubuntu 24.04" # Disable output interactive dialogs in console for service commands ENV DEBIAN_FRONTEND=noninteractive +ENV PLANTUML="1.2025.0" +ENV TZ="Europe/Moscow" # Nexus ARG NEXUS_DOMAIN_NAME="nexus.avroid.tech" @@ -21,8 +22,6 @@ RUN sed -ie "s/deb\ http\:\/\/archive.ubuntu.com\/ubuntu/deb\ [trusted=yes] http apt clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -ENV TZ="Europe/Moscow" - # Set timezone on Ubuntu RUN apt update && \ apt install -y --no-install-recommends tzdata && \ @@ -34,6 +33,9 @@ RUN apt update && \ # Upgrade OS in container RUN apt update && \ apt install -y --no-install-recommends apt-utils && \ + apt install doxygen wget graphviz default-jdk -y && \ apt dist-upgrade -y && \ - apt clean && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp* + +USER ubuntu +RUN wget https://github.com/plantuml/plantuml/releases/download/v${PLANTUML}/plantuml-${PLANTUML}.jar -P /home/ubuntu diff --git a/Makefile b/Makefile index 1feeb2f..412d8be 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,11 @@ .PHONY: all build push clean -IMAGE_NAME = template +IMAGE_NAME = doxygen IMAGE_GROUP = devops -IMAGE_TAG = 1.0 -REVISION = +IMAGE_TAG = 1.9.8 +REVISION = -1 DOCKER_REGISTRY = harbor.avroid.tech -CI_FLAGS = - -ifeq ($(CI), false) - CI_FLAGS = --no-cache -endif - all: @echo 'DEFAULT:' @echo ' make build' @@ -20,10 +14,11 @@ all: @echo ' make clean' build: - DOCKER_BUILDKIT=1 docker build $(CI_FLAGS) \ + DOCKER_BUILDKIT=1 docker build \ -f Dockerfile \ + --build-arg IMAGE_TAG=$(IMAGE_TAG) \ --platform linux/amd64 \ - -t $(DOCKER_REGISTRY)/$(IMAGE_GROUP)/$(IMAGE_NAME):$(IMAGE_TAG)$(REVISION) src/ + -t $(DOCKER_REGISTRY)/$(IMAGE_GROUP)/$(IMAGE_NAME):$(IMAGE_TAG)$(REVISION) . push: docker push $(DOCKER_REGISTRY)/$(IMAGE_GROUP)/$(IMAGE_NAME):$(IMAGE_TAG)$(REVISION) diff --git a/README.md b/README.md index d1458ba..21dce07 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ -# template-docker-image +# Doxygen with openjdk and PlantUML -## Данный репозиторий используется как основа для остальных репозиториев Для сборки образа выполните