Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker: update some dockerfiles #588

Closed
wants to merge 18 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions impls/ada.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:20.04
MAINTAINER Joel Martin <[email protected]>

##########################################################
Expand All @@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
RUN apt-get -y update

# Required for running tests
RUN apt-get -y install make python

# Some typical implementation and test requirements
RUN apt-get -y install curl libreadline-dev libedit-dev
RUN apt-get -y install make python3
RUN ln -fs /usr/bin/python3 /usr/local/bin/python

RUN mkdir -p /mal
WORKDIR /mal
Expand All @@ -22,4 +20,4 @@ WORKDIR /mal
##########################################################

# GNU Ada compiler
RUN apt-get -y install gnat-8
RUN apt-get -y install gnat libreadline-dev
10 changes: 4 additions & 6 deletions impls/ada/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:vivid
FROM ubuntu:20.04
MAINTAINER Joel Martin <[email protected]>

##########################################################
Expand All @@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
RUN apt-get -y update

# Required for running tests
RUN apt-get -y install make python

# Some typical implementation and test requirements
RUN apt-get -y install curl libreadline-dev libedit-dev
RUN apt-get -y install make python3
RUN ln -fs /usr/bin/python3 /usr/local/bin/python

RUN mkdir -p /mal
WORKDIR /mal
Expand All @@ -22,4 +20,4 @@ WORKDIR /mal
##########################################################

# GNU Ada compiler
RUN apt-get -y install gnat-4.9
RUN apt-get -y install gnat
8 changes: 3 additions & 5 deletions impls/awk/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:vivid
FROM ubuntu:20.04
MAINTAINER Joel Martin <[email protected]>

##########################################################
Expand All @@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
RUN apt-get -y update

# Required for running tests
RUN apt-get -y install make python

# Some typical implementation and test requirements
RUN apt-get -y install curl libreadline-dev libedit-dev
RUN apt-get -y install make python3
RUN ln -fs /usr/bin/python3 /usr/local/bin/python

RUN mkdir -p /mal
WORKDIR /mal
Expand Down
8 changes: 3 additions & 5 deletions impls/bash/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:vivid
FROM ubuntu:20.04
MAINTAINER Joel Martin <[email protected]>

##########################################################
Expand All @@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
RUN apt-get -y update

# Required for running tests
RUN apt-get -y install make python

# Some typical implementation and test requirements
RUN apt-get -y install curl libreadline-dev libedit-dev
RUN apt-get -y install make python3
RUN ln -fs /usr/bin/python3 /usr/local/bin/python

RUN mkdir -p /mal
WORKDIR /mal
Expand Down
9 changes: 4 additions & 5 deletions impls/bbc-basic/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ubuntu:18.04
FROM ubuntu:20.04
MAINTAINER Joel Martin <[email protected]>

##########################################################
# General requirements for testing or common across many
Expand All @@ -8,10 +9,8 @@ FROM ubuntu:18.04
RUN apt-get -y update

# Required for running tests
RUN apt-get -y install make python

# Some typical implementation and test requirements
RUN apt-get -y install curl libreadline-dev libedit-dev
RUN apt-get -y install make python3
RUN ln -fs /usr/bin/python3 /usr/local/bin/python

RUN mkdir -p /mal
WORKDIR /mal
Expand Down
8 changes: 3 additions & 5 deletions impls/c.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:20.04
MAINTAINER Duncan Watts <[email protected]>

##########################################################
Expand All @@ -9,10 +9,8 @@ MAINTAINER Duncan Watts <[email protected]>
RUN apt-get -y update

# Required for running tests
RUN apt-get -y install make python

# Some typical implementation and test requirements
#RUN apt-get -y install curl
RUN apt-get -y install make python3
RUN ln -fs /usr/bin/python3 /usr/local/bin/python

RUN mkdir -p /mal
WORKDIR /mal
Expand Down
17 changes: 6 additions & 11 deletions impls/clojure/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:20.04
MAINTAINER Joel Martin <[email protected]>

##########################################################
Expand All @@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
RUN apt-get -y update

# Required for running tests
RUN apt-get -y install make python

# Some typical implementation and test requirements
RUN apt-get -y install curl libreadline-dev libedit-dev
RUN apt-get -y install make python3
RUN ln -fs /usr/bin/python3 /usr/local/bin/python

RUN mkdir -p /mal
WORKDIR /mal
Expand All @@ -21,15 +19,13 @@ WORKDIR /mal
# Specific implementation requirements
##########################################################

RUN apt-get -y install curl libreadline-dev libedit-dev

#
# Clojure (Java and lein)
#

RUN apt-get -y install openjdk-8-jdk

ADD https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein \
/usr/local/bin/lein
RUN chmod 0755 /usr/local/bin/lein
RUN apt-get -y install leiningen
ENV LEIN_HOME /mal/.lein
ENV LEIN_JVM_OPTS -Duser.home=/mal

Expand All @@ -53,4 +49,3 @@ ENV NPM_CONFIG_CACHE /mal/.npm
#RUN npm install -g ffi lumo-cljs

ENV HOME=/mal

23 changes: 4 additions & 19 deletions impls/coffee/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:20.04
MAINTAINER Joel Martin <[email protected]>

##########################################################
Expand All @@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
RUN apt-get -y update

# Required for running tests
RUN apt-get -y install make python

# Some typical implementation and test requirements
RUN apt-get -y install curl libreadline-dev libedit-dev
RUN apt-get -y install make python3
RUN ln -fs /usr/bin/python3 /usr/local/bin/python

RUN mkdir -p /mal
WORKDIR /mal
Expand All @@ -21,19 +19,6 @@ WORKDIR /mal
# Specific implementation requirements
##########################################################

# For building node modules
RUN apt-get -y install g++

# Add nodesource apt repo config for 10.x stable
RUN apt-get -y install gnupg
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -

# Install nodejs
RUN apt-get -y install nodejs

RUN apt-get -y install coffeescript g++ libreadline-dev npm
ENV NPM_CONFIG_CACHE /mal/.npm

# CoffeeScript specific
RUN npm install -g coffeescript
RUN touch /.coffee_history && chmod go+w /.coffee_history

11 changes: 4 additions & 7 deletions impls/common-lisp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:vivid
FROM ubuntu:20.04
MAINTAINER Joel Martin <[email protected]>

##########################################################
Expand All @@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
RUN apt-get -y update

# Required for running tests
RUN apt-get -y install make python

# Some typical implementation and test requirements
RUN apt-get -y install curl libreadline-dev libedit-dev
RUN apt-get -y install make python3
RUN ln -fs /usr/bin/python3 /usr/local/bin/python

RUN mkdir -p /mal
WORKDIR /mal
Expand All @@ -21,8 +19,7 @@ WORKDIR /mal
# Specific implementation requirements
##########################################################

# Install git, make
RUN apt-get -y install git make
RUN apt-get -y install curl git libreadline-dev libedit-dev

# Install sbcl
RUN apt-get -y install sbcl
Expand Down
10 changes: 4 additions & 6 deletions impls/cpp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:vivid
FROM ubuntu:20.04
MAINTAINER Joel Martin <[email protected]>

##########################################################
Expand All @@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
RUN apt-get -y update

# Required for running tests
RUN apt-get -y install make python

# Some typical implementation and test requirements
RUN apt-get -y install curl libreadline-dev libedit-dev
RUN apt-get -y install make python3
RUN ln -fs /usr/bin/python3 /usr/local/bin/python

RUN mkdir -p /mal
WORKDIR /mal
Expand All @@ -22,4 +20,4 @@ WORKDIR /mal
##########################################################

# Install g++ for any C/C++ based implementations
RUN apt-get -y install g++
RUN apt-get -y install g++ libreadline-dev
5 changes: 1 addition & 4 deletions impls/cpp/Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')

CXX=g++
ifeq ($(uname_S),Darwin)
# Native build on yosemite. Requires: brew install readline
CXX=g++
READLINE=/usr/local/opt/readline
INCPATHS=-I$(READLINE)/include
LIBPATHS=-L$(READLINE)/lib
else
# Ubuntu 14.10 / docker
CXX=g++-4.9
endif

LD=$(CXX)
Expand Down
8 changes: 3 additions & 5 deletions impls/cs/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:vivid
FROM ubuntu:20.04
MAINTAINER Joel Martin <[email protected]>

##########################################################
Expand All @@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
RUN apt-get -y update

# Required for running tests
RUN apt-get -y install make python

# Some typical implementation and test requirements
RUN apt-get -y install curl libreadline-dev libedit-dev
RUN apt-get -y install make python3
RUN ln -fs /usr/bin/python3 /usr/local/bin/python

RUN mkdir -p /mal
WORKDIR /mal
Expand Down
12 changes: 4 additions & 8 deletions impls/elisp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:wily
FROM ubuntu:20.04
MAINTAINER Joel Martin <[email protected]>

##########################################################
Expand All @@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
RUN apt-get -y update

# Required for running tests
RUN apt-get -y install make python

# Some typical implementation and test requirements
RUN apt-get -y install curl libreadline-dev libedit-dev
RUN apt-get -y install make python3
RUN ln -fs /usr/bin/python3 /usr/local/bin/python

RUN mkdir -p /mal
WORKDIR /mal
Expand All @@ -21,6 +19,4 @@ WORKDIR /mal
# Specific implementation requirements
##########################################################

# Emacs 24
RUN apt-get -y install emacs24-nox

RUN apt-get -y install emacs-nox
13 changes: 3 additions & 10 deletions impls/elixir/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:xenial
FROM ubuntu:20.04
MAINTAINER Joel Martin <[email protected]>

##########################################################
Expand All @@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
RUN apt-get -y update

# Required for running tests
RUN apt-get -y install make python

# Some typical implementation and test requirements
RUN apt-get -y install curl libreadline-dev libedit-dev
RUN apt-get -y install make python3
RUN ln -fs /usr/bin/python3 /usr/local/bin/python

RUN mkdir -p /mal
WORKDIR /mal
Expand All @@ -22,9 +20,4 @@ WORKDIR /mal
##########################################################

# Elixir
RUN apt-get install -y wget
RUN wget https://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb
RUN dpkg -i erlang-solutions_1.0_all.deb
RUN apt-get update -y
RUN apt-get install -y esl-erlang
RUN apt-get install -y elixir
21 changes: 4 additions & 17 deletions impls/erlang/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:vivid
FROM ubuntu:20.04
MAINTAINER Joel Martin <[email protected]>

##########################################################
Expand All @@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
RUN apt-get -y update

# Required for running tests
RUN apt-get -y install make python

# Some typical implementation and test requirements
RUN apt-get -y install curl libreadline-dev libedit-dev
RUN apt-get -y install make python3
RUN ln -fs /usr/bin/python3 /usr/local/bin/python

RUN mkdir -p /mal
WORKDIR /mal
Expand All @@ -21,15 +19,4 @@ WORKDIR /mal
# Specific implementation requirements
##########################################################

# Erlang R17 (so I can use maps)
RUN apt-get -y install build-essential libncurses5-dev libssl-dev
RUN cd /tmp && curl -O http://www.erlang.org/download/otp_src_17.5.tar.gz \
&& tar -C /tmp -zxf /tmp/otp_src_17.5.tar.gz \
&& cd /tmp/otp_src_17.5 && ./configure && make && make install \
&& rm -rf /tmp/otp_src_17.5 /tmp/otp_src_17.5.tar.gz
# Rebar for building the Erlang implementation
RUN apt-get -y install git sudo
RUN cd /tmp/ && git clone -q https://github.com/rebar/rebar.git \
&& cd /tmp/rebar && ./bootstrap && cp rebar /usr/local/bin \
&& rm -rf /tmp/rebar

RUN apt-get -y install erlang rebar
2 changes: 0 additions & 2 deletions impls/erlang/rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
%% rebar configuration file (https://github.com/rebar/rebar)
%%

{require_otp_vsn, "17|18"}.

{erl_opts, [debug_info, fail_on_warning]}.

{clean_files, [
Expand Down
Loading