Skip to content

Commit 0e9383f

Browse files
authored
Development (#243)
* build on push development only * update readme
1 parent 88e998b commit 0e9383f

File tree

3 files changed

+17
-28
lines changed

3 files changed

+17
-28
lines changed

.github/workflows/build_release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
- 'development'
7-
- 'master'
7+
# - 'master'
88
paths-ignore:
99
- '**.md'
1010
pull_request:
@@ -151,7 +151,7 @@ jobs:
151151
# - name: '🚀 Docker Pull image cache'
152152
# id: get_image_cache
153153
# run: |
154-
# export DOCKER_TAG_SUFFIX_BRANCH=$(if [ "${{ steps.get_branch.outputs.name }}" = "master" ]; then echo "-${DOCKER_TARGET_RELEASE}"; else echo "-${{ steps.get_branch.outputs.name }}"; fi)
154+
# export DOCKER_TAG_SUFFIX_BRANCH=$(if [ "${{ steps.get_branch.outputs.name }}" = "master" ]; then echo "-${DOCKER_TARGET_RELEASE}"; else echo "-development"; fi)
155155
# docker pull ${DOCKER_TARGET_REPO}:${{ matrix.DOCKER_TAG_SUFFIX }}${DOCKER_TAG_SUFFIX_BRANCH} \
156156
# && export IMAGE_CACHE="--cache-from ${DOCKER_TARGET_REPO}:${{ matrix.DOCKER_TAG_SUFFIX }}${DOCKER_TAG_SUFFIX_BRANCH}" \
157157
# || export IMAGE_CACHE=""
@@ -160,7 +160,7 @@ jobs:
160160

161161
- name: '🚀 Docker - Build'
162162
run: |
163-
export DOCKER_TAG_SUFFIX_BRANCH=$(if [ "${{ steps.get_branch.outputs.name }}" = "master" ]; then echo "-${DOCKER_TARGET_RELEASE}"; else echo "-${{ steps.get_branch.outputs.name }}"; fi)
163+
export DOCKER_TAG_SUFFIX_BRANCH=$(if [ "${{ steps.get_branch.outputs.name }}" = "master" ]; then echo "-${DOCKER_TARGET_RELEASE}"; else echo "-development"; fi)
164164
165165
echo "DOCKER BUILD: Build Docker image ${DOCKER_TARGET_REPO}:${{ matrix.DOCKER_TAG_SUFFIX }}${DOCKER_TAG_SUFFIX_BRANCH}."
166166
echo "DOCKER BUILD: BASE_IMAGE - ${{matrix.BASE_IMAGE}}."
@@ -184,7 +184,7 @@ jobs:
184184
185185
- name: '🚀 Docker - Push'
186186
run: |
187-
export DOCKER_TAG_SUFFIX_BRANCH=$(if [ "${{ steps.get_branch.outputs.name }}" = "master" ]; then echo "-${DOCKER_TARGET_RELEASE}"; else echo "-${{ steps.get_branch.outputs.name }}"; fi)
187+
export DOCKER_TAG_SUFFIX_BRANCH=$(if [ "${{ steps.get_branch.outputs.name }}" = "master" ]; then echo "-${DOCKER_TARGET_RELEASE}"; else echo "-development"; fi)
188188
docker push ${DOCKER_TARGET_REPO}:${{ matrix.DOCKER_TAG_SUFFIX }}${DOCKER_TAG_SUFFIX_BRANCH}
189189
190190
################################################
@@ -209,8 +209,8 @@ jobs:
209209
- name: '🛰️ Docker - Publish Manifest'
210210
run: |
211211
export GET_BRANCH=${{ needs.build_release.outputs.get_branch }}
212-
export DOCKER_MANIFEST_SUFFIX=$(if [ "${GET_BRANCH}" = "master" ]; then echo "latest"; else echo "${GET_BRANCH}"; fi)
213-
export DOCKER_TAG_SUFFIX_BRANCH=$(if [ "${GET_BRANCH}" = "master" ]; then echo "-${DOCKER_TARGET_RELEASE}"; else echo "-${GET_BRANCH}"; fi)
212+
export DOCKER_MANIFEST_SUFFIX=$(if [ "${GET_BRANCH}" = "master" ]; then echo "latest"; else echo "development"; fi)
213+
export DOCKER_TAG_SUFFIX_BRANCH=$(if [ "${GET_BRANCH}" = "master" ]; then echo "-${DOCKER_TARGET_RELEASE}"; else echo "-development"; fi)
214214
215215
echo "DOCKER BUILD: Build Docker manifest ${DOCKER_TARGET_REPO}:${DOCKER_MANIFEST_SUFFIX}."
216216
echo "DOCKER BUILD: DOCKER_TARGET_REPO - ${DOCKER_TARGET_REPO}."
@@ -231,4 +231,4 @@ jobs:
231231
docker manifest annotate "${DOCKER_TARGET_REPO}:${DOCKER_MANIFEST_SUFFIX}" "${DOCKER_TARGET_REPO}:arm32v7${DOCKER_TAG_SUFFIX_BRANCH}" --os=linux --arch=arm --variant=v7
232232
docker manifest annotate "${DOCKER_TARGET_REPO}:${DOCKER_MANIFEST_SUFFIX}" "${DOCKER_TARGET_REPO}:arm64v8${DOCKER_TAG_SUFFIX_BRANCH}" --os=linux --arch=arm64 --variant=v8
233233
234-
docker manifest push "${DOCKER_TARGET_REPO}:${DOCKER_MANIFEST_SUFFIX}"
234+
docker manifest push "${DOCKER_TARGET_REPO}:${DOCKER_MANIFEST_SUFFIX}"

README.md

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<font size="-1">
22

33
[![DockerPulls](https://img.shields.io/docker/pulls/xirixiz/dsmr-reader-docker.svg)](https://img.shields.io/docker/pulls/xirixiz/dsmr-reader-docker/)
4+
[![Docker Build Status](https://github.com/oznu/docker-homebridge/workflows/Build/badge.svg)](https://github.com/xirixiz/dsmr-reader-docker/actions)
5+
[![Donate](https://img.shields.io/badge/donate-paypal-yellowgreen.svg)](https://www.paypal.com/donate/?business=9M4P6DGT7U7VU&no_recurring=0&item_name=Open+source+project+development.&currency_code=EUR)
46
[![BuyMeCoffee][buymecoffeebadge]][buymecoffee]
57

68
[buymecoffee]: https://www.buymeacoffee.com/xirixiz
@@ -20,9 +22,7 @@ You will need a cable and hardware that can run Docker.
2022
- [Screenshots](#screenshots)
2123
- [Technologies](#technologies)
2224
- [Releases](#releases)
23-
- [Stable releases](#stable-releases)
24-
- [Development releases](#development-releases)
25-
- [Setup](#setup)
25+
- [Setup / parameters](#setup--parameters)
2626
- [Features](#features)
2727
- [Issues](#issues)
2828
- [Inspiration](#inspiration)
@@ -49,28 +49,17 @@ The purpose of this project is to provide a simplified installation of DSMR-read
4949
***
5050
#### Releases
5151

52-
Docker tags/releases can be found here: https://hub.docker.com/r/xirixiz/dsmr-reader-docker/tags?page=1&ordering=last_updated
52+
This is a multi-arch image and will also run on a Raspberry Pi or other Docker-enabled ARMv6/7/8 devices.
5353

54-
##### Stable releases
55-
```text
56-
latest
57-
arm32v6-<version>
58-
arm32v7-<version>
59-
arm64v8-<version>
60-
amd64-<version>
61-
```
54+
| Image Tag | Architectures | Image OS |
55+
| :---------- | :------------------------------- | :---------------- |
56+
| latest | amd64, arm32v6, arm32v7, arm64v8 | Alpine Linux 3.13 |
57+
| development | amd64, arm32v6, arm32v7, arm64v8 | Alpine Linux 3.13 |
6258

63-
##### Development releases
64-
```text
65-
development
66-
arm32v6-development
67-
arm32v7-development
68-
arm64v8-development
69-
amd64-development
70-
```
59+
Docker tags/releases can be found here: https://hub.docker.com/r/xirixiz/dsmr-reader-docker/tags?page=1&ordering=last_updated
7160

7261
***
73-
#### Setup
62+
#### Setup / parameters
7463
For DSMR Reader specific environment settings, please refer to: https://dsmr-reader.readthedocs.io/nl/v4/env_settings.html
7564

7665
It's possible to set the following settings as environment variables, for example:

img/screenshot.png

70.2 KB
Loading

0 commit comments

Comments
 (0)