Skip to content

Commit 71cc8bc

Browse files
mabrarovmabrarov
committed
dockerfile: code style fix.
Signed-off-by: Marat Abrarov <[email protected]>
1 parent a87aa03 commit 71cc8bc

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

‎packaging/distros/amazonlinux/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ ARG BASE_BUILDER
77
# Use buildkit to skip unused base images: DOCKER_BUILDKIT=1
88

99
# Multiarch support
10-
FROM multiarch/qemu-user-static:x86_64-aarch64 as multiarch-aarch64
10+
FROM multiarch/qemu-user-static:x86_64-aarch64 AS multiarch-aarch64
1111

1212
# amazonlinux/2 base image
13-
FROM amazonlinux:2 as amazonlinux-2-base
13+
FROM amazonlinux:2 AS amazonlinux-2-base
1414

1515
ENV CMAKE_HOME="/opt/cmake"
1616
ARG CMAKE_VERSION="3.31.6"
@@ -33,7 +33,7 @@ RUN yum -y update && \
3333
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
3434

3535
# amazonlinux/2.arm64v8 base image
36-
FROM arm64v8/amazonlinux:2 as amazonlinux-2.arm64v8-base
36+
FROM arm64v8/amazonlinux:2 AS amazonlinux-2.arm64v8-base
3737

3838
COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
3939

@@ -57,7 +57,7 @@ RUN yum -y update && \
5757

5858
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
5959

60-
FROM amazonlinux:2023 as amazonlinux-2023-base
60+
FROM amazonlinux:2023 AS amazonlinux-2023-base
6161

6262
ENV CMAKE_HOME="/opt/cmake"
6363
ARG CMAKE_VERSION="3.31.6"
@@ -80,7 +80,7 @@ RUN yum -y update && \
8080
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
8181

8282
# hadolint ignore=DL3029
83-
FROM --platform=arm64 amazonlinux:2023 as amazonlinux-2023.arm64v8-base
83+
FROM --platform=arm64 amazonlinux:2023 AS amazonlinux-2023.arm64v8-base
8484

8585
COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
8686

@@ -106,7 +106,7 @@ ENV PATH="${CMAKE_HOME}/bin:${PATH}"
106106

107107
# Common build for all distributions now
108108
# hadolint ignore=DL3006
109-
FROM $BASE_BUILDER as builder
109+
FROM $BASE_BUILDER AS builder
110110

111111
ARG FLB_NIGHTLY_BUILD
112112
ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD

‎packaging/distros/centos/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ ARG BASE_BUILDER
77
# Use buildkit to skip unused base images: DOCKER_BUILDKIT=1
88

99
# Multiarch support
10-
FROM multiarch/qemu-user-static:x86_64-aarch64 as multiarch-aarch64
10+
FROM multiarch/qemu-user-static:x86_64-aarch64 AS multiarch-aarch64
1111

1212
# centos/7 base image
13-
FROM centos:7 as centos-7-base
13+
FROM centos:7 AS centos-7-base
1414

1515
ENV CMAKE_HOME="/opt/cmake"
1616
ARG CMAKE_VERSION="3.31.6"
@@ -41,7 +41,7 @@ ARG FLB_UNICODE_ENCODER=Off
4141
ENV FLB_UNICODE_ENCODER=$FLB_UNICODE_ENCODER
4242

4343
# centos/7.arm64v8 base image
44-
FROM arm64v8/centos:7 as centos-7.arm64v8-base
44+
FROM arm64v8/centos:7 AS centos-7.arm64v8-base
4545

4646
COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
4747

@@ -79,7 +79,7 @@ ARG FLB_JEMALLOC_OPTIONS="--with-lg-page=16 --with-lg-quantum=3"
7979
ENV FLB_JEMALLOC_OPTIONS=$FLB_JEMALLOC_OPTIONS
8080

8181
# centos/8 base image
82-
FROM centos:8 as centos-8-base
82+
FROM centos:8 AS centos-8-base
8383

8484
# CentOS is now EOL so have to use the vault repos
8585
RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \
@@ -114,7 +114,7 @@ ARG FLB_UNICODE_ENCODER=On
114114
ENV FLB_UNICODE_ENCODER=$FLB_UNICODE_ENCODER
115115

116116
# centos/8.arm64v8 base image
117-
FROM arm64v8/centos:8 as centos-8.arm64v8-base
117+
FROM arm64v8/centos:8 AS centos-8.arm64v8-base
118118

119119
COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
120120

@@ -154,7 +154,7 @@ ENV FLB_UNICODE_ENCODER=$FLB_UNICODE_ENCODER
154154
ARG FLB_JEMALLOC_OPTIONS="--with-lg-page=16 --with-lg-quantum=3"
155155
ENV FLB_JEMALLOC_OPTIONS=$FLB_JEMALLOC_OPTIONS
156156

157-
FROM quay.io/centos/centos:stream9 as centos-9-base
157+
FROM quay.io/centos/centos:stream9 AS centos-9-base
158158

159159
ENV CMAKE_HOME="/opt/cmake"
160160
ARG CMAKE_VERSION="3.31.6"
@@ -181,7 +181,7 @@ ARG FLB_OUT_PGSQL=On
181181
ENV FLB_OUT_PGSQL=$FLB_OUT_PGSQL
182182

183183
# hadolint ignore=DL3029
184-
FROM --platform=arm64 quay.io/centos/centos:stream9 as centos-9.arm64v8-base
184+
FROM --platform=arm64 quay.io/centos/centos:stream9 AS centos-9.arm64v8-base
185185

186186
COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
187187

@@ -217,7 +217,7 @@ ENV FLB_JEMALLOC_OPTIONS=$FLB_JEMALLOC_OPTIONS
217217

218218
# Common build for all distributions now
219219
# hadolint ignore=DL3006
220-
FROM $BASE_BUILDER as builder
220+
FROM $BASE_BUILDER AS builder
221221

222222
ARG FLB_NIGHTLY_BUILD
223223
ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD

‎packaging/distros/debian/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ ARG BASE_BUILDER
77
# Use buildkit to skip unused base images: DOCKER_BUILDKIT=1
88

99
# Multiarch support
10-
FROM multiarch/qemu-user-static:x86_64-aarch64 as multiarch-aarch64
10+
FROM multiarch/qemu-user-static:x86_64-aarch64 AS multiarch-aarch64
1111

1212
# debian/buster base image
13-
FROM debian:buster-slim as debian-buster-base
13+
FROM debian:buster-slim AS debian-buster-base
1414
ENV DEBIAN_FRONTEND="noninteractive" \
1515
CMAKE_HOME="/opt/cmake"
1616

@@ -34,7 +34,7 @@ RUN apt-get -qq update && \
3434
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
3535

3636
# debian/buster.arm64v8 base image
37-
FROM arm64v8/debian:buster-slim as debian-buster.arm64v8-base
37+
FROM arm64v8/debian:buster-slim AS debian-buster.arm64v8-base
3838
ENV DEBIAN_FRONTEND="noninteractive" \
3939
CMAKE_HOME="/opt/cmake"
4040

@@ -60,7 +60,7 @@ RUN apt-get -qq update && \
6060
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
6161

6262
# debian/bullseye base image
63-
FROM debian:bullseye-slim as debian-bullseye-base
63+
FROM debian:bullseye-slim AS debian-bullseye-base
6464
ENV DEBIAN_FRONTEND="noninteractive" \
6565
CMAKE_HOME="/opt/cmake"
6666

@@ -84,7 +84,7 @@ RUN apt-get -qq update && \
8484
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
8585

8686
# debian/bullseye.arm64v8 base image
87-
FROM arm64v8/debian:bullseye-slim as debian-bullseye.arm64v8-base
87+
FROM arm64v8/debian:bullseye-slim AS debian-bullseye.arm64v8-base
8888
ENV DEBIAN_FRONTEND="noninteractive" \
8989
CMAKE_HOME="/opt/cmake"
9090

@@ -110,7 +110,7 @@ RUN apt-get -qq update && \
110110
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
111111

112112
# debian/bookworm base image
113-
FROM debian:bookworm-slim as debian-bookworm-base
113+
FROM debian:bookworm-slim AS debian-bookworm-base
114114
ENV DEBIAN_FRONTEND="noninteractive" \
115115
CMAKE_HOME="/opt/cmake"
116116

@@ -134,7 +134,7 @@ RUN apt-get -qq update && \
134134
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
135135

136136
# debian/bookworm.arm64v8 base image
137-
FROM arm64v8/debian:bookworm-slim as debian-bookworm.arm64v8-base
137+
FROM arm64v8/debian:bookworm-slim AS debian-bookworm.arm64v8-base
138138
ENV DEBIAN_FRONTEND="noninteractive" \
139139
CMAKE_HOME="/opt/cmake"
140140

@@ -161,7 +161,7 @@ ENV PATH="${CMAKE_HOME}/bin:${PATH}"
161161

162162
# Common build for all distributions now
163163
# hadolint ignore=DL3006
164-
FROM $BASE_BUILDER as builder
164+
FROM $BASE_BUILDER AS builder
165165

166166
ARG FLB_NIGHTLY_BUILD
167167
ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD

‎packaging/distros/raspbian/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG BASE_BUILDER
66
# Lookup the name to use below but should follow the '<distro>-base' convention with slashes replaced.
77
# Use buildkit to skip unused base images: DOCKER_BUILDKIT=1
88

9-
FROM balenalib/rpi-raspbian:buster as raspbian-buster-base
9+
FROM balenalib/rpi-raspbian:buster AS raspbian-buster-base
1010
ENV DEBIAN_FRONTEND noninteractive
1111

1212
# Builder image so dependencies can be latest, recommended and no need to wipe
@@ -22,7 +22,7 @@ RUN apt-get update && \
2222
apt-get install -y --reinstall lsb-base lsb-release
2323

2424
# raspbian/bullseye base image
25-
FROM balenalib/rpi-raspbian:bullseye as raspbian-bullseye-base
25+
FROM balenalib/rpi-raspbian:bullseye AS raspbian-bullseye-base
2626
ENV DEBIAN_FRONTEND noninteractive
2727

2828
# hadolint ignore=DL3008,DL3015
@@ -35,7 +35,7 @@ RUN apt-get update && \
3535
apt-get install -y --reinstall lsb-base lsb-release
3636

3737
# raspbian/bookworm base image
38-
FROM balenalib/rpi-raspbian:bookworm as raspbian-bookworm-base
38+
FROM balenalib/rpi-raspbian:bookworm AS raspbian-bookworm-base
3939
ENV DEBIAN_FRONTEND noninteractive
4040

4141
# hadolint ignore=DL3008,DL3015
@@ -49,7 +49,7 @@ RUN apt-get update && \
4949

5050
# Common build for all distributions now
5151
# hadolint ignore=DL3006
52-
FROM $BASE_BUILDER as builder
52+
FROM $BASE_BUILDER AS builder
5353

5454
ARG FLB_NIGHTLY_BUILD
5555
ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD

‎packaging/distros/ubuntu/Dockerfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ ARG BASE_BUILDER
77
# Use buildkit to skip unused base images: DOCKER_BUILDKIT=1
88

99
# Multiarch support
10-
FROM multiarch/qemu-user-static:x86_64-aarch64 as multiarch-aarch64
10+
FROM multiarch/qemu-user-static:x86_64-aarch64 AS multiarch-aarch64
1111

1212
# ubuntu/16.04 base image
13-
FROM ubuntu:16.04 as ubuntu-16.04-base
13+
FROM ubuntu:16.04 AS ubuntu-16.04-base
1414
ENV DEBIAN_FRONTEND="noninteractive" \
1515
CMAKE_HOME="/opt/cmake"
1616

@@ -42,7 +42,7 @@ RUN apt-get update && \
4242
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
4343

4444
# ubuntu/18.04 base image
45-
FROM ubuntu:18.04 as ubuntu-18.04-base
45+
FROM ubuntu:18.04 AS ubuntu-18.04-base
4646
ENV DEBIAN_FRONTEND="noninteractive" \
4747
CMAKE_HOME="/opt/cmake"
4848

@@ -74,7 +74,7 @@ RUN apt-get update && \
7474
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
7575

7676
# ubuntu/18.04.arm64v8 base image
77-
FROM arm64v8/ubuntu:18.04 as ubuntu-18.04.arm64v8-base
77+
FROM arm64v8/ubuntu:18.04 AS ubuntu-18.04.arm64v8-base
7878
ENV DEBIAN_FRONTEND="noninteractive" \
7979
CMAKE_HOME="/opt/cmake"
8080

@@ -108,7 +108,7 @@ RUN apt-get update && \
108108
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
109109

110110
# ubuntu/20.04 base image
111-
FROM ubuntu:20.04 as ubuntu-20.04-base
111+
FROM ubuntu:20.04 AS ubuntu-20.04-base
112112
ENV DEBIAN_FRONTEND="noninteractive" \
113113
CMAKE_HOME="/opt/cmake"
114114

@@ -132,7 +132,7 @@ RUN apt-get update && \
132132
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
133133

134134
# ubuntu/20.04.arm64v8 base image
135-
FROM arm64v8/ubuntu:20.04 as ubuntu-20.04.arm64v8-base
135+
FROM arm64v8/ubuntu:20.04 AS ubuntu-20.04.arm64v8-base
136136
ENV DEBIAN_FRONTEND="noninteractive" \
137137
CMAKE_HOME="/opt/cmake"
138138

@@ -158,7 +158,7 @@ RUN apt-get update && \
158158
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
159159

160160
# ubuntu/22.04 base image
161-
FROM ubuntu:22.04 as ubuntu-22.04-base
161+
FROM ubuntu:22.04 AS ubuntu-22.04-base
162162
ENV DEBIAN_FRONTEND="noninteractive" \
163163
CMAKE_HOME="/opt/cmake"
164164

@@ -182,7 +182,7 @@ RUN apt-get update && \
182182
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
183183

184184
# ubuntu/22.04.arm64v8 base image
185-
FROM arm64v8/ubuntu:22.04 as ubuntu-22.04.arm64v8-base
185+
FROM arm64v8/ubuntu:22.04 AS ubuntu-22.04.arm64v8-base
186186
ENV DEBIAN_FRONTEND="noninteractive" \
187187
CMAKE_HOME="/opt/cmake"
188188

@@ -208,7 +208,7 @@ RUN apt-get update && \
208208
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
209209

210210
# ubuntu/24.04 base image
211-
FROM ubuntu:24.04 as ubuntu-24.04-base
211+
FROM ubuntu:24.04 AS ubuntu-24.04-base
212212
ENV DEBIAN_FRONTEND="noninteractive" \
213213
CMAKE_HOME="/opt/cmake"
214214

@@ -232,7 +232,7 @@ RUN apt-get update && \
232232
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
233233

234234
# ubuntu/24.04.arm64v8 base image
235-
FROM arm64v8/ubuntu:24.04 as ubuntu-24.04.arm64v8-base
235+
FROM arm64v8/ubuntu:24.04 AS ubuntu-24.04.arm64v8-base
236236
ENV DEBIAN_FRONTEND="noninteractive" \
237237
CMAKE_HOME="/opt/cmake"
238238

@@ -259,7 +259,7 @@ ENV PATH="${CMAKE_HOME}/bin:${PATH}"
259259

260260
# Common build for all distributions now
261261
# hadolint ignore=DL3006
262-
FROM $BASE_BUILDER as builder
262+
FROM $BASE_BUILDER AS builder
263263

264264
ARG FLB_NIGHTLY_BUILD
265265
ENV FLB_NIGHTLY_BUILD=$FLB_NIGHTLY_BUILD

0 commit comments

Comments
 (0)