Skip to content

Commit 87eb6b7

Browse files
authored
Update lldpd, build ignition from flatcar (#166)
1 parent b6051f4 commit 87eb6b7

5 files changed

Lines changed: 12 additions & 12 deletions

File tree

centos/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
ARG BASE_OS_VERSION
22

3-
FROM golang:1.18-buster as ignition-builder
3+
FROM golang:1.19-buster as ignition-builder
44
ARG IGNITION_BRANCH
55
WORKDIR /work
66
RUN set -ex \
77
&& apt-get update \
88
&& apt-get install -y libblkid-dev \
9-
&& git clone https://github.com/coreos/ignition.git \
9+
&& git clone https://github.com/flatcar/ignition.git \
1010
&& cd ignition \
1111
&& git checkout ${IGNITION_BRANCH} \
12-
&& GO111MODULE=off make \
12+
&& make \
1313
&& strip bin/amd64/ignition
1414

1515
FROM centos:${BASE_OS_VERSION}

centos/docker-make.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ name: centos
44
username: metalstack
55
registry-host: quay.io
66
default-build-args:
7-
- IGNITION_BRANCH=v0.35.0
8-
- GOLLDPD_VERSION=v0.4.0
7+
- IGNITION_BRANCH=v0.36.2
8+
- GOLLDPD_VERSION=v0.4.2
99
- FRR_VERSION=frr-8
1010
- OS_NAME=centos
1111
- SEMVER_PATCH=${SEMVER_PATCH}

debian/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
ARG BASE_OS_NAME
22
ARG BASE_OS_VERSION
33

4-
FROM golang:1.18-buster as ignition-builder
4+
FROM golang:1.19-buster as ignition-builder
55
ARG IGNITION_BRANCH
66
WORKDIR /work
77
RUN set -ex \
88
&& apt-get update \
99
&& apt-get install -y libblkid-dev \
10-
&& git clone https://github.com/coreos/ignition.git \
10+
&& git clone https://github.com/flatcar/ignition.git \
1111
&& cd ignition \
1212
&& git checkout ${IGNITION_BRANCH} \
13-
&& GO111MODULE=off make \
13+
&& make \
1414
&& strip bin/amd64/ignition
1515

1616
FROM ${BASE_OS_NAME}:${BASE_OS_VERSION}

debian/docker-make.debian.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ name: debian
44
username: metalstack
55
registry-host: quay.io
66
default-build-args:
7-
- IGNITION_BRANCH=v0.35.0
8-
- GOLLDPD_VERSION=v0.4.0
7+
- IGNITION_BRANCH=v0.36.2
8+
- GOLLDPD_VERSION=v0.4.2
99
- SEMVER_PATCH=${SEMVER_PATCH}
1010
- BASE_OS_NAME=debian
1111
- OS_NAME=debian

debian/docker-make.ubuntu.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ name: ubuntu
44
username: metalstack
55
registry-host: quay.io
66
default-build-args:
7-
- IGNITION_BRANCH=v0.35.0
8-
- GOLLDPD_VERSION=v0.4.0
7+
- IGNITION_BRANCH=v0.36.2
8+
- GOLLDPD_VERSION=v0.4.2
99
- SEMVER_PATCH=${SEMVER_PATCH}
1010
- BASE_OS_NAME=ubuntu
1111
- OS_NAME=ubuntu

0 commit comments

Comments
 (0)