Skip to content

Commit 829e306

Browse files
LysanderGGLysanderGG
authored
Merge pull request #1 from LysanderGG/docker-ubuntu-18
Make lts-13.20 use ubuntu 18
2 parents aa3a5f2 + a3466f3 commit 829e306

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

‎etc/dockerfiles/stack-build/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dockerfiles/stack-build
22
=======================
33

4-
Build [fpco/stack-build](https://hub.docker.com/r/fpco/stack-build/) Docker
4+
Build [cryptact/stack-build](https://hub.docker.com/r/cryptact/stack-build/) and [cryptact/stack-build-small](https://hub.docker.com/r/cryptact/stack-build-small/) Docker
55
images. This script and its Dockerfiles are used for building images for LTS >=
66
8.0.
77

‎etc/dockerfiles/stack-build/build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cd "$(dirname "$0")"
77
# Constants and defaults
88
#
99

10-
DOCKER_REPO=fpco/stack-build
10+
DOCKER_REPO=cryptact/stack-build
1111
PUSH=false
1212
DRY=false
1313
VARIANT=build
@@ -61,7 +61,7 @@ while [[ $# -gt 0 ]]; do
6161
;;
6262
--small)
6363
VARIANT=small
64-
DOCKER_REPO=fpco/stack-build-small
64+
DOCKER_REPO=cryptact/stack-build-small
6565
shift
6666
;;
6767
-*)

‎etc/dockerfiles/stack-build/lts-13.20/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:18.04
22

33
MAINTAINER Emanuel Borsboom <manny@fpcomplete.com>
44

@@ -27,10 +27,10 @@ ENV LANG=C.UTF-8 \
2727
#
2828

2929
RUN apt-get update && \
30-
apt-get install -y --no-install-recommends wget netbase ca-certificates && \
30+
apt-get install -y --no-install-recommends wget netbase ca-certificates gnupg2 && \
3131
if [ "$VARIANT" = "small" ]; then \
32-
echo "deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main" >>/etc/apt/sources.list && \
33-
echo "deb-src http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main" >>/etc/apt/sources.list && \
32+
echo "deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main" >>/etc/apt/sources.list && \
33+
echo "deb-src http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main" >>/etc/apt/sources.list && \
3434
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 063DAB2BDC0B3F9FCEBC378BFF3AEACEF6F88286 && \
3535
apt-get update && \
3636
apt-get install -y --no-install-recommends \

0 commit comments

Comments
 (0)