update doc

This commit is contained in:
James Swineson 2020-05-07 06:41:53 -07:00
parent 16981d023f
commit e991f6acf2
3 changed files with 23 additions and 8 deletions

View File

@ -1,3 +1,4 @@
## builder
FROM debian:10-slim as builder
LABEL image="ripe-atlas-builder"
ARG DEBIAN_FRONTEND=noninteractive
@ -9,27 +10,26 @@ RUN apt-get update -y \
WORKDIR /root
RUN git clone --recursive "$GIT_URL"
RUN ./ripe-atlas-software-probe/build-config/debian/bin/make-deb
## the actual image
FROM debian:10-slim
LABEL maintainer="dockerhub@public.swineson.me"
LABEL image="ripe-atlas"
ARG DEBIAN_FRONTEND=noninteractive
COPY --from=builder /root/atlasswprobe-*.deb /tmp
RUN ln -s /bin/true /bin/systemctl
RUN apt-get update -y \
RUN ln -s /bin/true /bin/systemctl \
&& apt-get update -y \
&& apt-get install -y libcap2-bin iproute2 openssh-client procps net-tools gosu \
&& dpkg -i /tmp/atlasswprobe-*.deb \
&& apt-get install -fy \
&& rm -rf /var/lib/apt/lists/* \
&& rm -f /tmp/atlasswprobe-*.deb
&& rm -f /tmp/atlasswprobe-*.deb \
&& ln -s /usr/local/atlas/bin/ATLAS /usr/local/bin/atlas
RUN ln -s /usr/local/atlas/bin/ATLAS /usr/local/bin/atlas
COPY entrypoint.sh /usr/local/bin
RUN chmod +x /usr/local/bin/* \
&& groupadd -fr atlas \
&& usermod -aG atlas atlas \
@ -43,3 +43,4 @@ VOLUME [ "/var/atlas-probe/etc", "/var/atlas-probe/status" ]
ENTRYPOINT [ "entrypoint.sh" ]
CMD [ "atlas" ]

View File

@ -12,6 +12,13 @@ This is the [RIPE Atlas software probe](https://atlas.ripe.net/docs/software-pro
* A Linux installation with Docker installed
* Internet access
## Tags
The following prebuilt tags are available at [Docker Hub](https://hub.docker.com/r/jamesits/ripe-atlas):
* `latest`: For arm64 (x86\_64) devices
* `latest-armv7l`: For armv7l (armhf) devices, e.g. Raspberry Pi (CI donated by [@OtakuNekoP](https://github.com/OtakuNekoP))
## Running
First we start the container:

View File

@ -29,7 +29,7 @@ schedules:
jobs:
- job: docker_nightly
displayName: "docker nightly image build"
displayName: "docker"
pool:
name: "$(POOL)"
vmImage: "ubuntu-latest"
@ -96,3 +96,10 @@ jobs:
containerregistrytype: 'Container Registry'
dockerRegistryEndpoint: "Docker Hub: Jamesits"
command: logout
- bash: |
docker system prune --all --force --filter "label=image=ripe-atlas-builder"
docker system prune --all --force --filter "label=image=ripe-atlas"
displayName: "Clean up"