diff --git a/Dockerfile b/Dockerfile index 6e1ae1f..330aa68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM ubuntu:14.04 MAINTAINER Ric Harvey # Surpress Upstart errors/warning @@ -10,18 +10,11 @@ ENV DEBIAN_FRONTEND noninteractive # Update base image # Add sources for latest nginx -# Add PHP packages from dotdeb # Install software requirements -ADD nginx_signing.key /nginx_signing.key -ADD dotdeb.gpg /dotdeb.gpg -RUN apt-get update && \ +RUN nginx=development && \ +add-apt-repository ppa:nginx/$nginx && \ +apt-get update && \ apt-get upgrade -y && \ -echo deb http://nginx.org/packages/mainline/debian/ jessie nginx >> /etc/apt/sources.list && \ -echo deb-src http://nginx.org/packages/mainline/debian/ jessie nginx >> /etc/apt/sources.list && \ -apt-key add /nginx_signing.key && \ -echo deb http://packages.dotdeb.org jessie all >> /etc/apt/sources.list && \ -echo deb-src http://packages.dotdeb.org jessie all >> /etc/apt/sources.list && \ -apt-key add /dotdeb.gpg && \ BUILD_PACKAGES="supervisor nginx php5-fpm git php5-mysql php5-mysql php-apc php5-curl php5-gd php5-intl php5-mcrypt php5-memcache php5-sqlite php5-tidy php5-xmlrpc php5-xsl php5-pgsql php5-mongo pwgen" && \ apt-get -y install $BUILD_PACKAGES && \ apt-get clean && \ diff --git a/dotdeb.gpg b/dotdeb.gpg deleted file mode 100644 index 8d1b361..0000000 --- a/dotdeb.gpg +++ /dev/null @@ -1,85 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG/MacGPG2 v2.0.14 (Darwin) - -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 -=Wpa7 ------END PGP PUBLIC KEY BLOCK----- diff --git a/nginx_signing.key b/nginx_signing.key deleted file mode 100644 index 7cb0768..0000000 --- a/nginx_signing.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.11 (FreeBSD) - -mQENBE5OMmIBCAD+FPYKGriGGf7NqwKfWC83cBV01gabgVWQmZbMcFzeW+hMsgxH -W6iimD0RsfZ9oEbfJCPG0CRSZ7ppq5pKamYs2+EJ8Q2ysOFHHwpGrA2C8zyNAs4I -QxnZZIbETgcSwFtDun0XiqPwPZgyuXVm9PAbLZRbfBzm8wR/3SWygqZBBLdQk5TE -fDR+Eny/M1RVR4xClECONF9UBB2ejFdI1LD45APbP2hsN/piFByU1t7yK2gpFyRt -97WzGHn9MV5/TL7AmRPM4pcr3JacmtCnxXeCZ8nLqedoSuHFuhwyDnlAbu8I16O5 -XRrfzhrHRJFM1JnIiGmzZi6zBvH0ItfyX6ttABEBAAG0KW5naW54IHNpZ25pbmcg -a2V5IDxzaWduaW5nLWtleUBuZ2lueC5jb20+iQE+BBMBAgAoBQJOTjJiAhsDBQkJ -ZgGABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCr9b2Ce9m/YpvjB/98uV4t -94d0oEh5XlqEZzVMrcTgPQ3BZt05N5xVuYaglv7OQtdlErMXmRWaFZEqDaMHdniC -sF63jWMd29vC4xpzIfmsLK3ce9oYo4t9o4WWqBUdf0Ff1LMz1dfLG2HDtKPfYg3C -8NESud09zuP5NohaE8Qzj/4p6rWDiRpuZ++4fnL3Dt3N6jXILwr/TM/Ma7jvaXGP -DO3kzm4dNKp5b5bn2nT2QWLPnEKxvOg5Zoej8l9+KFsUnXoWoYCkMQ2QTpZQFNwF -xwJGoAz8K3PwVPUrIL6b1lsiNovDgcgP0eDgzvwLynWKBPkRRjtgmWLoeaS9FAZV -ccXJMmANXJFuCf26iQEcBBABAgAGBQJOTkelAAoJEKZP1bF62zmo79oH/1XDb29S -YtWp+MTJTPFEwlWRiyRuDXy3wBd/BpwBRIWfWzMs1gnCjNjk0EVBVGa2grvy9Jtx -JKMd6l/PWXVucSt+U/+GO8rBkw14SdhqxaS2l14v6gyMeUrSbY3XfToGfwHC4sa/ -Thn8X4jFaQ2XN5dAIzJGU1s5JA0tjEzUwCnmrKmyMlXZaoQVrmORGjCuH0I0aAFk -RS0UtnB9HPpxhGVbs24xXZQnZDNbUQeulFxS4uP3OLDBAeCHl+v4t/uotIad8v6J -SO93vc1evIje6lguE81HHmJn9noxPItvOvSMb2yPsE8mH4cJHRTFNSEhPW6ghmlf -Wa9ZwiVX5igxcvaIRgQQEQIABgUCTk5b0gAKCRDs8OkLLBcgg1G+AKCnacLb/+W6 -cflirUIExgZdUJqoogCeNPVwXiHEIVqithAM1pdY/gcaQZmIRgQQEQIABgUCTk5f -YQAKCRCpN2E5pSTFPnNWAJ9gUozyiS+9jf2rJvqmJSeWuCgVRwCcCUFhXRCpQO2Y -Va3l3WuB+rgKjsQ= -=A015 ------END PGP PUBLIC KEY BLOCK-----