From 82f576adf8c93888129bb2571ef73aa2baeafd84 Mon Sep 17 00:00:00 2001 From: servostar Date: Wed, 17 Apr 2024 16:06:23 +0200 Subject: [PATCH 1/2] adapted docker files of SDK and DEVKIT to use alpine instead of alma --- Dockerfile | 4 ++-- sdk/Dockerfile | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index d694bd8..1d5ce4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM servostar/gemstone:sdk-0.1.0-alma-9.3 +FROM servostar/gemstone:sdk-0.2.0-alpine-3.19.1 LABEL authors="servostar" -LABEL version="0.1.0" +LABEL version="0.2.0" LABEL description="docker image for setting up the build pipeline on SDK" LABEL website="https://github.com/Servostar/gemstone" diff --git a/sdk/Dockerfile b/sdk/Dockerfile index 296a627..098f659 100644 --- a/sdk/Dockerfile +++ b/sdk/Dockerfile @@ -1,13 +1,13 @@ -FROM almalinux:9.3 +FROM alpine:3.19.1 LABEL authors="servostar" -LABEL version="0.1.0" +LABEL version="0.2.0" LABEL description="base image for building the gemstone programming language compiler" LABEL website="https://github.com/Servostar/gemstone" # install dependencies -RUN yum install cmake gcc flex byacc -y +RUN apk add build-base gcc make cmake bison flex # create user for build -RUN adduser lorang +RUN adduser --disabled-password lorang WORKDIR /home/lorang USER lorang \ No newline at end of file From f61317b1236530f5f32c225a4a5142b04d479748 Mon Sep 17 00:00:00 2001 From: servostar Date: Wed, 17 Apr 2024 16:06:53 +0200 Subject: [PATCH 2/2] removed unecessary header from log.h --- src/sys/log.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sys/log.h b/src/sys/log.h index 7e81d92..691a38e 100644 --- a/src/sys/log.h +++ b/src/sys/log.h @@ -2,7 +2,6 @@ #define _SYS_ERR_H_ #include -#include #include #define LOG_DEFAULT_STREAM stderr