Skip to content

Commit b942c89

Browse files
committed
Add armv6
1 parent 6d0a043 commit b942c89

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

.travis.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ env:
66
- NODE_VERSION=12
77
- CC_TEST_REPORTER_ID=054a8c4f2007b9299933b67221504554462eed6cbb06c364c926a9869dfd4020
88
- DOCKER_CLI_EXPERIMENTAL=enabled
9-
- IMAGE_VERSION=latest
9+
- IMAGE_VERSION=develop
1010

1111
before_install:
1212

@@ -49,8 +49,14 @@ after_script:
4949
- docker version
5050
- make prepare
5151

52+
# Override image version with latest if master branch
53+
- if [ "$TRAVIS_BRANCH" == "master" ] ; then export IMAGE_VERSION=latest; fi
54+
5255
# Override image version with tag name if any
5356
- if [ ! -z "$TRAVIS_TAG" ] ; then export IMAGE_VERSION=$TRAVIS_TAG; fi
5457

55-
# Buils & push image
56-
- make build IMAGE_NAME=$DOCKER_USERNAME/teleinfo-mqtt IMAGE_VERSION=$IMAGE_VERSION
58+
# Build & push image
59+
- make build IMAGE_NAME=$DOCKER_USERNAME/teleinfo-mqtt BASE_IMAGE=node:12-alpine IMAGE_VERSION=$IMAGE_VERSION PLATFORMS=linux/arm/v7,linux/arm64/v8,linux/386,linux/amd64
60+
61+
# Build & push image (armv6)
62+
- make build IMAGE_NAME=$DOCKER_USERNAME/teleinfo-mqtt BASE_IMAGE=arm32v6/node:12-alpine IMAGE_VERSION=$IMAGE_VERSION-armv6 PLATFORMS=linux/arm/v6

Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM node:12-alpine
1+
ARG BASE_IMAGE=node:12-alpine
2+
FROM $BASE_IMAGE
23

34
LABEL maintainer="fmartinou"
45

Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ prepare: install
1010

1111
build:
1212
docker buildx build --push \
13-
--platform linux/arm/v7,linux/arm64/v8,linux/386,linux/amd64 \
13+
--platform ${PLATFORMS} \
14+
--build-arg BASE_IMAGE=${BASE_IMAGE} \
1415
-t ${IMAGE_NAME}:${IMAGE_VERSION} .

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Read teleinfo from serial port and publish with mqtt.
1111

1212
## Usage
13-
Run the official Docker image (i386, amd64, armv7, arm64).
13+
Run the official Docker image (i386, amd64, armv6, armv7, arm64).
1414

1515
### Run
1616
```

app/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ async function disconnect() {
88
}
99

1010
async function run() {
11+
log.info('Starting teleinfo-mqtt');
1112
try {
1213
// Connect to MQTT
1314
await mqtt.connect();

0 commit comments

Comments
 (0)