Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
f24cdbac1c
|
|||
535af64d1a
|
|||
29fd3a5234
|
|||
8637dc0f57
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -6,5 +6,6 @@ cube/pubsubc.a
|
|||||||
test
|
test
|
||||||
.bash_history
|
.bash_history
|
||||||
.vscode
|
.vscode
|
||||||
|
.dccache
|
||||||
|
sink/.dccache
|
||||||
|
|
||||||
|
@ -1,13 +1,25 @@
|
|||||||
stages:
|
stages:
|
||||||
- check
|
|
||||||
- build
|
- build
|
||||||
- deploy
|
- deploy
|
||||||
|
|
||||||
include:
|
variables:
|
||||||
- project: dockerized/commons
|
IMAGE_NAME: $CI_REGISTRY/$CI_PROJECT_PATH
|
||||||
ref: master
|
|
||||||
file: gitlab-ci-template.yml
|
|
||||||
|
|
||||||
|
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:
|
deploy:
|
||||||
image: registry.hottis.de/dockerized/docker-bash:latest
|
image: registry.hottis.de/dockerized/docker-bash:latest
|
||||||
stage: deploy
|
stage: deploy
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.13 AS builder
|
FROM alpine:3.18.3 AS builder
|
||||||
|
|
||||||
ARG VERSION="dockerized"
|
ARG VERSION="dockerized"
|
||||||
|
|
||||||
@ -13,7 +13,7 @@ RUN \
|
|||||||
make VERSION=${VERSION}
|
make VERSION=${VERSION}
|
||||||
|
|
||||||
|
|
||||||
FROM alpine:3.13
|
FROM alpine:3.18.3
|
||||||
|
|
||||||
COPY --from=builder /tmp/sink/build/sink20169 /usr/local/bin/
|
COPY --from=builder /tmp/sink/build/sink20169 /usr/local/bin/
|
||||||
|
|
||||||
|
@ -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).
|
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).
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
CREATE SEQUENCE device_s START WITH 1 INCREMENT BY 1;
|
|
||||||
|
|
||||||
CREATE TABLE device_t (
|
|
||||||
id integer PRIMARY KEY DEFAULT NEXTVAL('device_s'),
|
|
||||||
deviceid varchar(16) UNIQUE NOT NULL,
|
|
||||||
sharedsecret varchar(31) NOT NULL CHECK(char_length(sharedSecret) = 31),
|
|
||||||
location varchar(128) NOT NULL,
|
|
||||||
active boolean NOT NULL DEFAULT false
|
|
||||||
);
|
|
Reference in New Issue
Block a user