Skip to content

Commit f680fd5

Browse files
committed
Move OCI standard labels to end of file
1 parent 9ce9cd7 commit f680fd5

1 file changed

Lines changed: 27 additions & 25 deletions

File tree

Dockerfile

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,33 @@
11
FROM eu.gcr.io/long-grin-186810/rs-php:7.4.4-apache-2.4.38.0
22
LABEL maintainer="Ralph Schuster <github@ralph-schuster.eu>"
33

4+
RUN apt-get update && apt-get update && apt-get install -y --no-install-recommends \
5+
patch \
6+
&& rm -rf /var/lib/apt/lists/*
7+
8+
#ADD etc/php/ /usr/local/etc/php/conf.d/
9+
#ADD etc/conf/ /etc/apache2/conf-enabled/
10+
#ADD etc/mods/ /etc/apache2/mods-enabled/
11+
#ADD etc/sites/ /etc/apache2/sites-enabled/
12+
RUN chown -R www-data:www-data /var/www/html
13+
14+
ENV PFA_VERSION="3.2.4"
15+
ENV PFA_URL="https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-${PFA_VERSION}.tar.gz"
16+
RUN set -xe \
17+
&& cd /var/www/html \
18+
&& curl -o postfixadmin.tar.gz -L "$PFA_URL" \
19+
&& tar --strip-components=1 -xvf postfixadmin.tar.gz \
20+
&& rm postfixadmin.tar.gz \
21+
&& mkdir templates_c
22+
23+
ADD src/ /var/www/html/
24+
RUN patch model/MailboxHandler.php < MailboxHandler.php.patch
25+
26+
RUN chown -R www-data:www-data .
27+
28+
#####################################################################
29+
# Image OCI labels
30+
#####################################################################
431
ARG ARG_CREATED
532
ARG ARG_URL
633
ARG ARG_SOURCE
@@ -12,7 +39,6 @@ ARG ARG_DESCRIPTION
1239
ARG ARG_DOCUMENTATION
1340
ARG ARG_AUTHORS
1441
ARG ARG_LICENSES
15-
ARG ARG_REF_NAME
1642

1743
LABEL org.opencontainers.image.created=$ARG_CREATED
1844
LABEL org.opencontainers.image.url=$ARG_URL
@@ -25,28 +51,4 @@ LABEL org.opencontainers.image.description=$ARG_DESCRIPTION
2551
LABEL org.opencontainers.image.documentation=$ARG_DOCUMENTATION
2652
LABEL org.opencontainers.image.authors=$ARG_AUTHORS
2753
LABEL org.opencontainers.image.licenses=$ARG_LICENSES
28-
LABEL org.opencontainers.image.ref.name=$ARG_REF_NAME
2954

30-
RUN apt-get update && apt-get update && apt-get install -y --no-install-recommends \
31-
patch \
32-
&& rm -rf /var/lib/apt/lists/*
33-
34-
#ADD etc/php/ /usr/local/etc/php/conf.d/
35-
#ADD etc/conf/ /etc/apache2/conf-enabled/
36-
#ADD etc/mods/ /etc/apache2/mods-enabled/
37-
#ADD etc/sites/ /etc/apache2/sites-enabled/
38-
RUN chown -R www-data:www-data /var/www/html
39-
40-
ENV PFA_VERSION="3.2.4"
41-
ENV PFA_URL="https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-${PFA_VERSION}.tar.gz"
42-
RUN set -xe \
43-
&& cd /var/www/html \
44-
&& curl -o postfixadmin.tar.gz -L "$PFA_URL" \
45-
&& tar --strip-components=1 -xvf postfixadmin.tar.gz \
46-
&& rm postfixadmin.tar.gz \
47-
&& mkdir templates_c
48-
49-
ADD src/ /var/www/html/
50-
RUN patch model/MailboxHandler.php < MailboxHandler.php.patch
51-
52-
RUN chown -R www-data:www-data .

0 commit comments

Comments
 (0)