Cleanup and minor updates

CHANGELOG.md

@@ -1,6 +1,17 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 2.0.0 - [2024-07-11]
+### Added
+- Added pcre and pcre2 libraries
+
+### Changed
+- Changed the CI/CD to use woodpecker instead drone
+- Changed the repository structure to support image versioning in releases
+- Updated SDL 2.30.4
+
+# v1 Changelog
+
 ## 2024-02-10
 ### Added
 - Added a lot of libraries for newlib and clib2

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://drone-gh.intercube.gr/api/badges/walkero-gr/AmigaGCConDocker/status.svg)](https://drone-gh.intercube.gr/walkero-gr/AmigaGCConDocker)
+[![status-badge](https://cigh.walkero.gr/api/badges/2/status.svg)](https://cigh.walkero.gr/repos/2)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/a2a863e7754e46c7bafaed8e47e8e41a)](https://www.codacy.com/gh/walkero-gr/AmigaGCConDocker/dashboard?utm_source=github.com&utm_medium=referral&utm_content=walkero-gr/AmigaGCConDocker&utm_campaign=Badge_Grade)
 [![CodeFactor](https://www.codefactor.io/repository/github/walkero-gr/amigagccondocker/badge)](https://www.codefactor.io/repository/github/walkero-gr/amigagccondocker)
 [![Docker Pulls](https://img.shields.io/docker/pulls/walkero/amigagccondocker?color=brightgreen)](https://hub.docker.com/r/walkero/amigagccondocker)

ppc-amigaos/Makefile

@@ -4,9 +4,10 @@ OS?=os4
 GCC?=11
 # adtools, afxgroup
 # CLIB2_REPO?=adtools
+REL?=2.0.0
 
 REPO?=walkero/amigagccondocker
-TAG?=$(OS)-gcc$(GCC)-1.0.0
+TAG?=$(OS)-gcc$(GCC)-$(REL)
 VOLUMES?=-v "${PWD}/code":/opt/code
 WORKSPACE?=-w /opt/code
 NAME?=$(OS)-gcc$(GCC)
@@ -32,39 +33,27 @@ help:
 	@echo ""
 
 build:
-	docker build -f ./$(OS).Dockerfile \
+	docker build -f ./Dockerfile \
 		-t $(REPO):$(TAG) \
 		--progress plain \
 		--build-arg OS=$(OS) \
-		--build-arg GCC_VER=$(GCC) .
+		--build-arg GCC_VER=$(GCC) \
+		--build-arg REL=$(REL) .
 
 buildnc:
-	docker build --no-cache -f ./$(OS).Dockerfile \
+	docker build --no-cache -f ./Dockerfile \
 		-t $(REPO):$(TAG) \
 		--progress plain \
 		--build-arg OS=$(OS) \
-		--build-arg GCC_VER=$(GCC) .
-
-# build-exp:
-# 	docker build -f ./$(OS).Dockerfile \
-# 		-t $(REPO):$(OS)-gcc$(GCC)-exp \
-# 		--progress plain \
-# 		--build-arg OS=$(OS) \
-# 		--build-arg CLIB2_REPO=exp \
-# 		--build-arg GCC_VER=$(GCC) .
+		--build-arg GCC_VER=$(GCC) \
+		--build-arg REL=$(REL) .
 
 shell:
 	docker run -it --rm --name $(TAG) $(VOLUMES) $(WORKSPACE) $(REPO):$(TAG) /bin/bash
 
-# shell-exp:
-# 	docker run -it --rm --name $(OS)-gcc$(GCC)-exp $(VOLUMES) $(WORKSPACE) $(REPO):$(OS)-gcc$(GCC)-exp /bin/bash
-
 push:
 	docker push $(REPO):$(TAG)
 
-# push-exp:
-# 	docker push $(REPO):$(OS)-gcc$(GCC)-exp
-
 logs:
 	docker logs $(NAME)
 

ppc-amigaos/scripts/setup-tools.sh

@@ -45,8 +45,6 @@ apt-get update && apt-get -y dist-upgrade && \
 apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*;
 
 mkdir -p /opt/code
-# rm -rf ${APPC}/ppc-amigaos/SDK && \
-# 	ln -s /opt/sdk/ppc-amigaos/ ${APPC}/ppc-amigaos/SDK
 
 ln -s /usr/bin/python3 /usr/bin/python