Skip to content

Commit e36af0a

Browse files
committed
added manifest feature
1 parent a5055fa commit e36af0a

File tree

4 files changed

+20
-13
lines changed

4 files changed

+20
-13
lines changed

Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
1010
org.label-schema.vcs-url="https://github.com/HilscherAutomation/netPI-raspbian" \
1111
org.label-schema.vcs-ref=$VCS_REF
1212

13-
#enable cross compiling (comment out next line if built on Raspberry Pi)
14-
RUN [ "cross-build-start" ]
15-
1613
#version
17-
ENV HILSCHERNETPI_RASPBIAN_VERSION 1.2.1
14+
ENV HILSCHERNETPI_RASPBIAN_VERSION 1.2.2
1815

1916
#labeling
2017
LABEL maintainer="netpi@hilscher.com" \
@@ -185,5 +182,3 @@ EXPOSE 22
185182
#set STOPSGINAL
186183
STOPSIGNAL SIGTERM
187184

188-
#disable cross compiling (comment out next line if built on Raspberry Pi)
189-
RUN [ "cross-build-end" ]

README.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
## Raspbian
22

3-
[![](https://images.microbadger.com/badges/image/hilschernetpi/netpi-raspbian.svg)](https://microbadger.com/images/hilschernetpi/netpi-raspbian "Raspbian")
43
[![](https://images.microbadger.com/badges/commit/hilschernetpi/netpi-raspbian.svg)](https://microbadger.com/images/hilschernetpi//netpi-raspbian "Raspbian")
54
[![Docker Registry](https://img.shields.io/docker/pulls/hilschernetpi/netpi-raspbian.svg)](https://registry.hub.docker.com/r/hilschernetpi/netpi-raspbian/) 
65
[![Image last updated](https://img.shields.io/badge/dynamic/json.svg?url=https://api.microbadger.com/v1/images/hilschernetpi/netpi-raspbian&label=Image%20last%20updated&query=$.LastUpdated&colorB=007ec6)](http://microbadger.com/images/hilschernetpi/netpi-raspbian "Image last updated") 
@@ -99,12 +98,6 @@ Continue to use [Linux commands](https://www.raspberrypi.org/documentation/linux
9998

10099
For additional help or information visit the Hilscher Forum at https://forum.hilscher.com/
101100

102-
### Contaner automated build
103-
104-
The project complies with the scripting based [Dockerfile](https://docs.docker.com/engine/reference/builder/) method to build the image output file. Using this method is a precondition for an [automated](https://docs.docker.com/docker-hub/builds/) web based build process on DockerHub platform.
105-
106-
DockerHub web platform is x86 CPU based, but an ARM CPU coded output file is needed for Raspberry Pi systems. This is why the Dockerfile includes the [balena.io](https://balena.io/blog/building-arm-containers-on-any-x86-machine-even-dockerhub/) steps.
107-
108101
### License
109102

110103
View the license information for the software in the project. As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained).

hooks/post_push

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
3+
# Use manifest-tool to create the manifest, given the experimental
4+
# "docker manifest" command isn't available yet on Docker Hub.
5+
6+
curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download/v0.9.0/manifest-tool-linux-amd64
7+
chmod +x manifest-tool
8+
9+
./manifest-tool push from-args \
10+
--platforms linux/arm \
11+
--template "$IMAGE_NAME" \
12+
--target "$IMAGE_NAME"
13+

hooks/pre_build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
# Register qemu-*-static for all supported processors except the
4+
# current one, but also remove all registered binfmt_misc before
5+
docker run --rm --privileged multiarch/qemu-user-static:register --reset
6+

0 commit comments

Comments
 (0)