Skip to content

Commit 557edfb

Browse files
stasadevstasadev
authored
build: fix FromAsCasing warning from Dockerfile, for ddev#6462 [skip ci] (ddev#6520)
1 parent 13b269c commit 557edfb

File tree

7 files changed

+20
-22
lines changed

7 files changed

+20
-22
lines changed

‎.gitpod/images/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM gitpod/workspace-base:latest as workspace-base
1+
FROM gitpod/workspace-base:latest AS workspace-base
22
SHELL ["/bin/bash", "-c"]
33

44
USER root

‎containers/ddev-dbserver/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ RUN /sbin/mkhomedir_helper www-data
8181
# Have requested them to update this in https://bugs.mysql.com/bug.php?id=105632
8282
# But they haven't done it, and it will break things when it expires.
8383
RUN rm -f /etc/apt/sources.list.d/mysql.list && \
84-
for item in "A4A9 4068 76FC BD3C 4567 70C8 8C71 8D3B 5072 E1F5" ; do \
85-
apt-key remove "${item}" || true; \
86-
done;
84+
for item in "A4A9 4068 76FC BD3C 4567 70C8 8C71 8D3B 5072 E1F5" ; do \
85+
apt-key remove "${item}" || true; \
86+
done;
8787

8888
# Normal upstream image doesn't actually have /home/mysql created
8989
# Make sure it's there in case user 999 (mysql) is using this image.

‎containers/ddev-nginx-proxy-router/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN apt-get -qq update && \
2121
ca-certificates certbot curl iputils-ping less python3-certbot-nginx procps telnet vim wget && \
2222
apt-get autoremove -y && \
2323
apt-get clean -y && \
24-
rm -rf /var/lib/apt/lists/*
24+
rm -rf /var/lib/apt/lists/*
2525

2626
# Download docker-gen
2727
RUN set -eu -o pipefail && \
@@ -42,7 +42,7 @@ RUN set -eu -o pipefail && \
4242

4343
# Configure Nginx and apply fix for very long server names
4444
RUN echo "daemon off;" >> /etc/nginx/nginx.conf \
45-
&& sed -i 's/worker_processes 1/worker_processes auto/' /etc/nginx/nginx.conf
45+
&& sed -i 's/worker_processes 1/worker_processes auto/' /etc/nginx/nginx.conf
4646

4747
# We don't want the default.conf provided by nginx package
4848
RUN rm -f /etc/nginx/conf.d/default.conf

‎containers/ddev-php-base/Dockerfile

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
### ---------------------------base--------------------------------------
22
### Build the base Debian image that will be used in every other image
3-
FROM debian:bookworm-slim as base
3+
FROM debian:bookworm-slim AS base
44

55
RUN ls -l $(which dpkg-split) && ls -l $(which dpkg-deb)
66
RUN for item in dpkg-split dpkg-deb; do \
7-
if [ ! -f /usr/sbin/$item ]; then \
8-
ln -sf /usr/bin/$item /usr/sbin/$item; \
9-
fi; \
7+
if [ ! -f /usr/sbin/$item ]; then \
8+
ln -sf /usr/bin/$item /usr/sbin/$item; \
9+
fi; \
1010
done
1111
RUN for item in tar rm; do \
12-
if [ ! -f /usr/sbin/$item ]; then \
13-
ln -sf /bin/$item /usr/sbin/$item; \
14-
fi; \
12+
if [ ! -f /usr/sbin/$item ]; then \
13+
ln -sf /bin/$item /usr/sbin/$item; \
14+
fi; \
1515
done
1616

1717
RUN ls -l /usr/sbin/dpkg-split /usr/sbin/dpkg-deb /usr/sbin/tar /usr/sbin/rm
@@ -37,7 +37,7 @@ RUN apt-get -qq install --no-install-recommends --no-install-suggests -y \
3737
### See https://github.com/ddev/ddev/issues/6159
3838
### We don't need to recompile every Xdebug library https://xdebug.org/docs/compat (only PHP 8.0, 8.1, 8.2 can have Xdebug 3.2)
3939
### PECL does not allow you to install multiple versions of Xdebug, so there is `rm -f xdebug.reg`
40-
FROM base as ddev-xdebug-build
40+
FROM base AS ddev-xdebug-build
4141
SHELL ["/bin/bash", "-c"]
4242
RUN curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb && \
4343
dpkg -i /tmp/debsuryorg-archive-keyring.deb && rm -f /tmp/debsuryorg-archive-keyring.deb && \
@@ -77,7 +77,7 @@ ARG BUILDPLATFORM
7777
SHELL ["/bin/bash", "-c"]
7878

7979
RUN curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor \
80-
| tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null
80+
| tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null
8181
RUN echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] \
8282
http://nginx.org/packages/debian `lsb_release -cs` nginx" > /etc/apt/sources.list.d/nginx.list
8383

‎containers/ddev-traefik-router/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ WORKDIR /mnt/ddev-global-cache/traefik
66
COPY /traefik_healthcheck.sh /healthcheck.sh
77
RUN chmod ugo+rx /healthcheck.sh
88
HEALTHCHECK --interval=1s --timeout=120s --retries=1 --start-period=120s CMD /healthcheck.sh
9-

‎containers/ddev-webserver/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
### Build ddev-php-base from ddev-webserver-base
44
### ddev-php-base is the basic of ddev-php-prod
55
### and ddev-webserver-* (For DDEV local Usage)
6-
FROM ddev/ddev-php-base:v1.23.4 as ddev-webserver-base
6+
FROM ddev/ddev-php-base:v1.23.4 AS ddev-webserver-base
77

88
ENV DEBIAN_FRONTEND=noninteractive
99

@@ -74,7 +74,7 @@ RUN mkdir -p /usr/local/mariadb-old/bin && cp -ap /tmp/extracted/usr/bin/{mariad
7474

7575
### ---------------------------ddev-webserver-dev-base--------------------------------------
7676
### Build ddev-webserver-dev-base from ddev-webserver-base
77-
FROM ddev-webserver-base as ddev-webserver-dev-base
77+
FROM ddev-webserver-base AS ddev-webserver-dev-base
7878
ENV CAROOT=/mnt/ddev-global-cache/mkcert
7979
ENV PHP_DEFAULT_VERSION="8.2"
8080

@@ -194,7 +194,7 @@ RUN update-alternatives --set php /usr/bin/php${PHP_DEFAULT_VERSION}
194194
### This could be known as ddev-webserver-dev as it's development-env targeted
195195
### But for historical reasons, it's just ddev-webserver
196196
### Build ddev-webserver by turning ddev-webserver-dev-base into one layer
197-
FROM scratch as ddev-webserver
197+
FROM scratch AS ddev-webserver
198198
ENV PHP_DEFAULT_VERSION="8.2"
199199
ENV NGINX_SITE_TEMPLATE=/etc/nginx/nginx-site.conf
200200
ENV APACHE_SITE_TEMPLATE=/etc/apache2/apache-site.conf
@@ -221,7 +221,7 @@ CMD ["/start.sh"]
221221
### ---------------------------ddev-webserver-prod-base--------------------------------------
222222
### Build ddev-webserver-prod-base from ddev-webserver-base
223223
### This image is aimed at actual hardened production environments
224-
FROM ddev-webserver-base as ddev-webserver-prod-base
224+
FROM ddev-webserver-base AS ddev-webserver-prod-base
225225
ENV CAROOT=/mnt/ddev-global-cache/mkcert
226226
ENV PHP_DEFAULT_VERSION="8.2"
227227
ARG TARGETPLATFORM
@@ -304,7 +304,7 @@ RUN update-alternatives --set php /usr/bin/php${PHP_DEFAULT_VERSION}
304304
### ---------------------------ddev-webserver-prod--------------------------------------
305305
### Build ddev-webserver-prod, the hardened version of ddev-webserver-base
306306
### (Withut dev features, single layer)
307-
FROM scratch as ddev-webserver-prod
307+
FROM scratch AS ddev-webserver-prod
308308
ENV PHP_DEFAULT_VERSION="8.2"
309309
ENV NGINX_SITE_TEMPLATE=/etc/nginx/nginx-site.conf
310310
ENV APACHE_SITE_TEMPLATE=/etc/apache2/apache-site.conf

‎containers/test-ssh-server/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ EXPOSE 22
1111
COPY /files /
1212
RUN chmod -R go-rwx /root/.ssh
1313
CMD ["/usr/sbin/sshd","-D", "-e"]
14-

0 commit comments

Comments
 (0)