Browse Source

Changes to fix Docker warnings

pull/857/head
Tim Kimber 1 year ago
parent
commit
d763342fd0
No known key found for this signature in database GPG Key ID: 3E1804964E76BD18
13 changed files with 55 additions and 55 deletions
  1. +3
    -3
      test/Dockerfile-centos7
  2. +5
    -5
      test/Dockerfile-centos7-duckdns
  3. +5
    -5
      test/Dockerfile-centos7-dynu
  4. +3
    -3
      test/Dockerfile-centos8
  5. +3
    -3
      test/Dockerfile-debian
  6. +3
    -3
      test/Dockerfile-rockylinux8
  7. +4
    -4
      test/Dockerfile-ubuntu
  8. +8
    -8
      test/Dockerfile-ubuntu-acmedns
  9. +6
    -6
      test/Dockerfile-ubuntu-duckdns
  10. +6
    -6
      test/Dockerfile-ubuntu-dynu
  11. +3
    -3
      test/Dockerfile-ubuntu14
  12. +3
    -3
      test/Dockerfile-ubuntu16
  13. +3
    -3
      test/Dockerfile-ubuntu18

+ 3
- 3
test/Dockerfile-centos7 View File

@ -8,9 +8,9 @@ RUN yum -y install ftp vsftpd
RUN yum -y install openssh-server
# Set locale
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV LANGUAGE=en_US:en
ENV LC_ALL=en_US.UTF-8
WORKDIR /root
RUN mkdir -p /etc/nginx/pki/private


+ 5
- 5
test/Dockerfile-centos7-duckdns View File

@ -8,12 +8,12 @@ RUN yum -y install epel-release
RUN yum -y install git curl bind-utils ldns wget which nginx jq
# Set locale
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV LANGUAGE=en_US:en
ENV LC_ALL=en_US.UTF-8
ENV staging "true"
ENV dynamic_dns "dynu"
ENV staging="true"
ENV dynamic_dns="dynu"
WORKDIR /root
RUN mkdir -p /etc/nginx/pki/private


+ 5
- 5
test/Dockerfile-centos7-dynu View File

@ -8,12 +8,12 @@ RUN yum -y install epel-release
RUN yum -y install git curl bind-utils ldns wget which nginx jq
# Set locale
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV LANGUAGE=en_US:en
ENV LC_ALL=en_US.UTF-8
ENV staging "true"
ENV dynamic_dns "duckdns"
ENV staging="true"
ENV dynamic_dns="duckdns"
WORKDIR /root
RUN mkdir -p /etc/nginx/pki


+ 3
- 3
test/Dockerfile-centos8 View File

@ -15,9 +15,9 @@ RUN yum -y install ftp vsftpd
RUN yum -y install openssh-server
# Set locale
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV LANGUAGE=en_US:en
ENV LC_ALL=en_US.UTF-8
WORKDIR /root
RUN mkdir -p /etc/nginx/pki/private


+ 3
- 3
test/Dockerfile-debian View File

@ -11,9 +11,9 @@ RUN apt-get install -y locales # for idn testing
# Set locale
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV LANGUAGE=en_US:en
ENV LC_ALL=en_US.UTF-8
WORKDIR /root
RUN mkdir -p /etc/nginx/pki/private


+ 3
- 3
test/Dockerfile-rockylinux8 View File

@ -10,9 +10,9 @@ RUN yum -y update && \
glibc-locale-source glibc-langpack-en # for en_US.UTF-8 support
# Set locale
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV LANGUAGE=en_US:en
ENV LC_ALL=en_US.UTF-8
WORKDIR /root
RUN mkdir -p /etc/nginx/pki/private


+ 4
- 4
test/Dockerfile-ubuntu View File

@ -3,7 +3,7 @@ FROM ubuntu:latest
# Note this image uses mawk1.3
# Set noninteractive otherwise tzdata hangs
ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive
# Update and install required software
RUN apt-get update --fix-missing
@ -15,9 +15,9 @@ RUN apt-get install -y locales # for idn testing
# Set locale
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV LANGUAGE=en_US:en
ENV LC_ALL=en_US.UTF-8
# Setup ftp
ENV VSFTPD_CONF=/etc/vsftpd.conf


+ 8
- 8
test/Dockerfile-ubuntu-acmedns View File

@ -3,14 +3,14 @@ FROM ubuntu:latest
# Note this image uses mawk1.3
# Set noninteractive otherwise tzdata hangs
ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive
# Ensure tests in this image use the staging server
ENV staging "true"
ENV staging="true"
# 2016ENV dynamic_dns "acme-dns"
ENV ACMEDNS_API_USER 49ac5f6d-74cd-4aca-acfe-f9457af7894c
ENV ACMEDNS_API_KEY 2NPGF8cH7PeTrHZWXImi1prhTsQGz2pdCC7Za5zE
ENV ACMEDNS_SUBDOMAIN 7268181b-7075-4dce-be51-9c20c205cf6e
ENV ACMEDNS_API_USER=49ac5f6d-74cd-4aca-acfe-f9457af7894c
ENV ACMEDNS_API_KEY=2NPGF8cH7PeTrHZWXImi1prhTsQGz2pdCC7Za5zE
ENV ACMEDNS_SUBDOMAIN=7268181b-7075-4dce-be51-9c20c205cf6e
# Update and install required software
RUN apt-get update --fix-missing
@ -20,9 +20,9 @@ RUN apt-get install -y locales # for idn testing
# Set locale
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV LANGUAGE=en_US:en
ENV LC_ALL=en_US.UTF-8
WORKDIR /root


+ 6
- 6
test/Dockerfile-ubuntu-duckdns View File

@ -3,11 +3,11 @@ FROM ubuntu:latest
# Note this image uses mawk1.3
# Set noninteractive otherwise tzdata hangs
ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive
# Ensure tests in this image use the staging server
ENV staging "true"
ENV dynamic_dns "duckdns"
ENV staging="true"
ENV dynamic_dns="duckdns"
# Update and install required software
RUN apt-get update --fix-missing
@ -17,9 +17,9 @@ RUN apt-get install -y locales # for idn testing
# Set locale
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV LANGUAGE=en_US:en
ENV LC_ALL=en_US.UTF-8
WORKDIR /root


+ 6
- 6
test/Dockerfile-ubuntu-dynu View File

@ -3,11 +3,11 @@ FROM ubuntu:latest
# Note this image uses mawk1.3
# Set noninteractive otherwise tzdata hangs
ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive
# Ensure tests in this image use the staging server
ENV staging "true"
ENV dynamic_dns "dynu"
ENV staging="true"
ENV dynamic_dns="dynu"
# Update and install required software
RUN apt-get update --fix-missing
@ -17,9 +17,9 @@ RUN apt-get install -y locales # for idn testing
# Set locale
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV LANGUAGE=en_US:en
ENV LC_ALL=en_US.UTF-8
WORKDIR /root


+ 3
- 3
test/Dockerfile-ubuntu14 View File

@ -13,9 +13,9 @@ RUN apt-get update --fix-missing && \
# Set locale
RUN locale-gen en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV LANGUAGE=en_US:en
ENV LC_ALL=en_US.UTF-8
WORKDIR /root
RUN mkdir -p /etc/nginx/pki/private


+ 3
- 3
test/Dockerfile-ubuntu16 View File

@ -12,9 +12,9 @@ RUN apt-get install -y locales # for idn testing
# Set locale
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV LANGUAGE=en_US:en
ENV LC_ALL=en_US.UTF-8
WORKDIR /root
RUN mkdir -p /etc/nginx/pki/private


+ 3
- 3
test/Dockerfile-ubuntu18 View File

@ -12,9 +12,9 @@ RUN apt-get install -y locales # for idn testing
# Set locale
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV LANGUAGE=en_US:en
ENV LC_ALL=en_US.UTF-8
WORKDIR /root
RUN mkdir -p /etc/nginx/pki/private


Loading…
Cancel
Save