2 Commits
0.0.3 ... 0.0.5

Author SHA1 Message Date
f24cdbac1c new apline base image 2023-09-13 12:50:11 +02:00
535af64d1a refactor ci script 2022-01-11 11:03:59 +01:00
4 changed files with 22 additions and 8 deletions

3
.gitignore vendored
View File

@ -6,5 +6,6 @@ cube/pubsubc.a
test
.bash_history
.vscode
.dccache
sink/.dccache

View File

@ -1,13 +1,25 @@
stages:
- check
- build
- deploy
include:
- project: dockerized/commons
ref: master
file: gitlab-ci-template.yml
variables:
IMAGE_NAME: $CI_REGISTRY/$CI_PROJECT_PATH
build:
image: registry.hottis.de/dockerized/docker-bash:latest
stage: build
tags:
- hottis
- linux
- docker
script:
- docker build --tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} .
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY;
- docker push $IMAGE_NAME:${CI_COMMIT_SHORT_SHA}
- if [ "$CI_COMMIT_TAG" != "" ]; then
docker tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} $IMAGE_NAME:${CI_COMMIT_TAG};
docker push $IMAGE_NAME:${CI_COMMIT_TAG};
fi
deploy:
image: registry.hottis.de/dockerized/docker-bash:latest
stage: deploy

View File

@ -1,4 +1,4 @@
FROM alpine:3.13 AS builder
FROM alpine:3.18.3 AS builder
ARG VERSION="dockerized"
@ -13,7 +13,7 @@ RUN \
make VERSION=${VERSION}
FROM alpine:3.13
FROM alpine:3.18.3
COPY --from=builder /tmp/sink/build/sink20169 /usr/local/bin/

View File

@ -32,3 +32,4 @@ Measurement is visualized at https://grafana.mainscnt.eu.
The projects of the three current variants are at [RPi](https://home.hottis.de/gitlab/wolutator/mains-frequency-counter-rpi), [STM32](https://home.hottis.de/gitlab/wolutator/mains-frequency-counter-stm32) and [ESP32](https://home.hottis.de/gitlab/wolutator/mains-frequency-counter-esp32).