From 3427fc2b267c0c2df28b96ce5b6fda4c167bb08e Mon Sep 17 00:00:00 2001 From: Liliesh Date: Tue, 16 Apr 2024 20:30:01 +0200 Subject: [PATCH 01/10] Added docker and makefile --- Dockerfile | 12 ++++++++++++ Makefile | 9 +++++++++ 2 files changed, 21 insertions(+) create mode 100644 Dockerfile create mode 100644 Makefile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..9f8c8ac --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM rockylinux:9.3 + +# Install base +RUN dnf install -y rpmdevtools rpmlint epel-release +RUN dnf group install -y "Development Tools" +RUN dnf install -y dpkg + +# Install lang specifics +RUN dnf install -y rust cargo +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + +CMD [ "/bin/bash" ] \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..d837f75 --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +all: latest version + +latest: + podman build -t liliesh/franky:latest . + podman push localhost/liliesh/franky:latest registry.satecloud.com/liliesh/franky:latest + +version: + podman build -t liliesh/franky:9.3 . + podman push localhost/liliesh/franky:9.3 registry.satecloud.com/liliesh/franky:9.3 \ No newline at end of file From 5d4029c8b64f5f8162247e9ffd8eddd017526656 Mon Sep 17 00:00:00 2001 From: Liliesh Date: Tue, 16 Apr 2024 21:31:13 +0200 Subject: [PATCH 02/10] Fixed path --- Dockerfile | 2 ++ Makefile | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9f8c8ac..3df4cf3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,4 +9,6 @@ RUN dnf install -y dpkg RUN dnf install -y rust cargo RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y +ENV PATH="$HOME/.cargo/bin:$PATH" + CMD [ "/bin/bash" ] \ No newline at end of file diff --git a/Makefile b/Makefile index d837f75..270dbec 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,15 @@ -all: latest version +build: build-latest build-version -latest: +build-latest: podman build -t liliesh/franky:latest . + + +build-version: + podman build -t liliesh/franky:9.3 . + +publish: publish-latest publish-version +publish-latest: podman push localhost/liliesh/franky:latest registry.satecloud.com/liliesh/franky:latest -version: - podman build -t liliesh/franky:9.3 . +publish-version: podman push localhost/liliesh/franky:9.3 registry.satecloud.com/liliesh/franky:9.3 \ No newline at end of file From 01d30491ac280c56936e586b3d98467522edd7b8 Mon Sep 17 00:00:00 2001 From: Liliesh Date: Thu, 18 Apr 2024 20:23:26 +0200 Subject: [PATCH 03/10] Stuff --- Dockerfile | 2 +- Makefile | 24 ++++++++++++++---------- packager/Dockerfile | 8 ++++++++ 3 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 packager/Dockerfile diff --git a/Dockerfile b/Dockerfile index 3df4cf3..60b6bae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,6 @@ RUN dnf install -y dpkg RUN dnf install -y rust cargo RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -ENV PATH="$HOME/.cargo/bin:$PATH" +ENV PATH="/root/.cargo/bin:$PATH" CMD [ "/bin/bash" ] \ No newline at end of file diff --git a/Makefile b/Makefile index 270dbec..23b5dee 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,19 @@ +BUILD_TAG ?= latest + + build: build-latest build-version +publish: publish-generic publish-packager + +build-generic: + podman build -t liliesh/franky:$(BUILD_TAG) . + +build-packager: + podman build -t liliesh/franky-packager:$(BUILD_TAG) packager/. -build-latest: - podman build -t liliesh/franky:latest . - -build-version: - podman build -t liliesh/franky:9.3 . - publish: publish-latest publish-version -publish-latest: - podman push localhost/liliesh/franky:latest registry.satecloud.com/liliesh/franky:latest +publish-generic: + podman push localhost/liliesh/franky:$(BUILD_TAG) registry.satecloud.com/liliesh/franky:$(BUILD_TAG) -publish-version: - podman push localhost/liliesh/franky:9.3 registry.satecloud.com/liliesh/franky:9.3 \ No newline at end of file +publish-packager: + podman push localhost/liliesh/franky-packager:$(BUILD_TAG) registry.satecloud.com/liliesh/franky-packager:$(BUILD_TAG) diff --git a/packager/Dockerfile b/packager/Dockerfile new file mode 100644 index 0000000..8e0dc80 --- /dev/null +++ b/packager/Dockerfile @@ -0,0 +1,8 @@ +FROM rockylinux:9.3 + +# Install base +RUN dnf install -y rpmdevtools rpmlint epel-release +RUN dnf group install -y "Development Tools" +RUN dnf install -y dpkg + +CMD [ "/bin/bash" ] \ No newline at end of file From 3303d62959325a699cf23bb35932d6e66832a09d Mon Sep 17 00:00:00 2001 From: Liliesh Date: Fri, 28 Jun 2024 19:26:15 +0200 Subject: [PATCH 04/10] Updated franky --- Makefile | 27 ++++++++++----------------- docker/Dockerfile | 5 +++++ Dockerfile => rust/Dockerfile | 2 +- 3 files changed, 16 insertions(+), 18 deletions(-) create mode 100644 docker/Dockerfile rename Dockerfile => rust/Dockerfile (94%) diff --git a/Makefile b/Makefile index 23b5dee..561f024 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,12 @@ -BUILD_TAG ?= latest +BUILD_TAG = $(shell date +'%Y.%m.%d') +IMAGE ?= packager +build: + echo "Building franky-$(IMAGE) with tag $(BUILD_TAG)" + podman build -t liliesh/franky-$(IMAGE):$(BUILD_TAG) $(IMAGE)/. + podman image tag liliesh/franky-$(IMAGE):$(BUILD_TAG) liliesh/franky-$(IMAGE):latest -build: build-latest build-version -publish: publish-generic publish-packager - -build-generic: - podman build -t liliesh/franky:$(BUILD_TAG) . - -build-packager: - podman build -t liliesh/franky-packager:$(BUILD_TAG) packager/. - - -publish: publish-latest publish-version -publish-generic: - podman push localhost/liliesh/franky:$(BUILD_TAG) registry.satecloud.com/liliesh/franky:$(BUILD_TAG) - -publish-packager: - podman push localhost/liliesh/franky-packager:$(BUILD_TAG) registry.satecloud.com/liliesh/franky-packager:$(BUILD_TAG) +publish: + podman build -t liliesh/franky-$(IMAGE):$(BUILD_TAG) $(IMAGE)/. + podman push localhost/liliesh/franky-$(IMAGE):$(BUILD_TAG) registry.satecloud.com/liliesh/franky-$(IMAGE):$(BUILD_TAG) + podman push localhost/liliesh/franky-$(IMAGE):$(BUILD_TAG) registry.satecloud.com/liliesh/franky-$(IMAGE):latest diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..ce1bf68 --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,5 @@ +FROM alpine:3.20.1 + +# Install base +RUN apk add --no-cache docker docker-compose bash +CMD [ "/bin/bash" ] \ No newline at end of file diff --git a/Dockerfile b/rust/Dockerfile similarity index 94% rename from Dockerfile rename to rust/Dockerfile index 60b6bae..56bd259 100644 --- a/Dockerfile +++ b/rust/Dockerfile @@ -11,4 +11,4 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y ENV PATH="/root/.cargo/bin:$PATH" -CMD [ "/bin/bash" ] \ No newline at end of file +CMD [ "/bin/bash" ] From 90cca67c93013b88c8a4ba280e8032a4ba277dd5 Mon Sep 17 00:00:00 2001 From: Liliesh Date: Fri, 28 Jun 2024 19:26:32 +0200 Subject: [PATCH 05/10] Switched docker from bash to sh --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index ce1bf68..5a3df14 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.20.1 # Install base -RUN apk add --no-cache docker docker-compose bash -CMD [ "/bin/bash" ] \ No newline at end of file +RUN apk add --no-cache docker docker-compose +CMD [ "/bin/sh" ] \ No newline at end of file From 7cbf2a4c3ca575cb890ee20bc8bd382f07860d64 Mon Sep 17 00:00:00 2001 From: Liliesh Date: Wed, 10 Jul 2024 18:21:51 +0200 Subject: [PATCH 06/10] Added commander --- commander/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 commander/Dockerfile diff --git a/commander/Dockerfile b/commander/Dockerfile new file mode 100644 index 0000000..2c7d2ba --- /dev/null +++ b/commander/Dockerfile @@ -0,0 +1,6 @@ +FROM alpine:3.20.1 + +# Install base +RUN apk add --no-cache --upgrade grep +RUN apk add --no-cache bash git +CMD [ "/bin/sh" ] \ No newline at end of file From 2c2a8b392eae78f0490f5f884c678f43a9a4fd45 Mon Sep 17 00:00:00 2001 From: Liliesh Date: Wed, 10 Jul 2024 18:23:32 +0200 Subject: [PATCH 07/10] changed entrypoint for commander --- commander/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commander/Dockerfile b/commander/Dockerfile index 2c7d2ba..db34904 100644 --- a/commander/Dockerfile +++ b/commander/Dockerfile @@ -3,4 +3,4 @@ FROM alpine:3.20.1 # Install base RUN apk add --no-cache --upgrade grep RUN apk add --no-cache bash git -CMD [ "/bin/sh" ] \ No newline at end of file +CMD [ "/bin/bash" ] \ No newline at end of file From 5c2deb3ac93cb6f13bbc8e2285b6ebb060dae8ca Mon Sep 17 00:00:00 2001 From: Liliesh Date: Wed, 10 Jul 2024 18:27:11 +0200 Subject: [PATCH 08/10] added bash to franky-docker --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5a3df14..ce1bf68 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.20.1 # Install base -RUN apk add --no-cache docker docker-compose -CMD [ "/bin/sh" ] \ No newline at end of file +RUN apk add --no-cache docker docker-compose bash +CMD [ "/bin/bash" ] \ No newline at end of file From 7f9bba6727abfa4b51c8d847ea507190d8356e8e Mon Sep 17 00:00:00 2001 From: Liliesh Date: Wed, 10 Jul 2024 20:13:58 +0200 Subject: [PATCH 09/10] added ssh to commander --- commander/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commander/Dockerfile b/commander/Dockerfile index db34904..69b89fd 100644 --- a/commander/Dockerfile +++ b/commander/Dockerfile @@ -2,5 +2,5 @@ FROM alpine:3.20.1 # Install base RUN apk add --no-cache --upgrade grep -RUN apk add --no-cache bash git +RUN apk add --no-cache bash git openssh CMD [ "/bin/bash" ] \ No newline at end of file From 8caca309b2c3efad4fd262f45daf4adaebc864d2 Mon Sep 17 00:00:00 2001 From: Liliesh Date: Sat, 21 Jun 2025 05:28:44 +0200 Subject: [PATCH 10/10] Updated Makefile --- Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 561f024..c6eecef 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,14 @@ BUILD_TAG = $(shell date +'%Y.%m.%d') IMAGE ?= packager +REGISTRY=registry.pinkhaj.world +ENGINE=podman build: echo "Building franky-$(IMAGE) with tag $(BUILD_TAG)" - podman build -t liliesh/franky-$(IMAGE):$(BUILD_TAG) $(IMAGE)/. - podman image tag liliesh/franky-$(IMAGE):$(BUILD_TAG) liliesh/franky-$(IMAGE):latest + $(ENGINE) build -t liliesh/franky-$(IMAGE):$(BUILD_TAG) $(IMAGE)/. + $(ENGINE) image tag liliesh/franky-$(IMAGE):$(BUILD_TAG) liliesh/franky-$(IMAGE):latest publish: - podman build -t liliesh/franky-$(IMAGE):$(BUILD_TAG) $(IMAGE)/. - podman push localhost/liliesh/franky-$(IMAGE):$(BUILD_TAG) registry.satecloud.com/liliesh/franky-$(IMAGE):$(BUILD_TAG) - podman push localhost/liliesh/franky-$(IMAGE):$(BUILD_TAG) registry.satecloud.com/liliesh/franky-$(IMAGE):latest + $(ENGINE) build -t liliesh/franky-$(IMAGE):$(BUILD_TAG) $(IMAGE)/. + $(ENGINE) push localhost/liliesh/franky-$(IMAGE):$(BUILD_TAG) $(REGISTRY)/liliesh/franky-$(IMAGE):$(BUILD_TAG) + $(ENGINE) push localhost/liliesh/franky-$(IMAGE):$(BUILD_TAG) $(REGISTRY)/liliesh/franky-$(IMAGE):latest