* Use Ubuntu 15.10 in Dockerfile.

UWOS · Nov 2, 2015 · 6af4940 · 6af4940
1 parent 42fa768
commit 6af4940
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
-FROM ubuntu:15.04
+FROM ubuntu:15.10
 ENV PATH /usr/games:$PATH
 RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y afnix algol68g aplus-fsf asymptote ats-lang-anairiats bash bc bf bsdgames cduce clisp clojure1.6 cmake coffeescript dc ecere-sdk emacs24 erlang f2c fp-compiler fsharp g++ gambas3-script gap gauche gawk gcc gdc genius gforth gfortran ghc ghostscript gnat gnu-smalltalk gnuplot gobjc golang gpt gri groff groovy haxe icont iconx intercal iverilog jasmin-sable jq julia libgd2-xpm-dev libpng12-dev lisaac llvm lua5.2 make maxima mlton mono-devel mono-mcs mono-vbnc nasm neko nickle ocaml octave open-cobol openjdk-6-jdk pari-gp parrot perl php5-cli pike7.8 python r-base ratfor regina-rexx rhino ruby2.1 scala scilab slsh spl-core swi-prolog tcc tcl ucblogo valac xsltproc yorick zoem
+RUN apt-get install -y afnix algol68g aplus-fsf asymptote ats-lang-anairiats bash bc bf bsdgames cduce clisp clojure1.6 cmake coffeescript dc ecere-sdk emacs24 erlang f2c fp-compiler fsharp g++ gambas3-script gap gauche gawk gcc gdc genius gforth gfortran ghc ghostscript gnat gnu-smalltalk gnuplot gobjc golang gpt gri groff groovy haxe icont iconx intercal iverilog jasmin-sable jq julia libgd-dev libpng12-dev lisaac llvm lua5.2 make maxima mlton mono-devel mono-mcs mono-vbnc nasm neko nickle ocaml octave open-cobol openjdk-6-jdk pari-gp parrot perl php5-cli pike7.8 python r-base ratfor regina-rexx rhino ruby2.1 scala scilab slsh spl-core swi-prolog tcc tcl ucblogo valac xsltproc yorick zoem
 ADD . /usr/local/share/quine-relay
 WORKDIR /usr/local/share/quine-relay
 RUN make -C vendor

diff --git a/README.md b/README.md
@@ -33,8 +33,8 @@ First, you have to type the following apt-get command to install all of them.
       gambas3-script gap gauche gawk gcc gdc genius gforth gfortran ghc \
       ghostscript gnat gnu-smalltalk gnuplot gobjc golang gpt gri groff \
       groovy haxe icont iconx intercal iverilog jasmin-sable jq julia \
-      libgd2-xpm-dev libpng12-dev lisaac llvm lua5.2 make maxima mlton \
-      mono-devel mono-mcs mono-vbnc nasm neko nickle ocaml octave open-cobol \
+      libgd-dev libpng12-dev lisaac llvm lua5.2 make maxima mlton mono-devel \
+      mono-mcs mono-vbnc nasm neko nickle ocaml octave open-cobol \
       openjdk-6-jdk pari-gp parrot perl php5-cli pike7.8 python r-base \
       ratfor regina-rexx rhino ruby2.1 scala scilab slsh spl-core swi-prolog \
       tcl ucblogo valac xsltproc yorick zoem

diff --git a/src/Dockerfile.gen.rb b/src/Dockerfile.gen.rb
@@ -1,12 +1,12 @@
 require_relative "code-gen"
 
 apts = RunSteps.flat_map {|s| s.apt }
-other_packages = %w(cmake libpng12-dev libgd2-xpm-dev groff tcc)
+other_packages = %w(cmake libpng12-dev libgd-dev groff tcc)
 
 apts = [*apts.flatten.compact.uniq, *other_packages].sort
 
 dockerfile = []
-dockerfile << "FROM ubuntu:15.04"
+dockerfile << "FROM ubuntu:15.10"
 dockerfile << "ENV PATH /usr/games:$PATH"
 dockerfile << "RUN apt-get update && apt-get upgrade -y"
 

diff --git a/src/README.md.gen.rb b/src/README.md.gen.rb
@@ -2,7 +2,7 @@
 require "erb"
 require "cairo"
 
-other_packages = %w(cmake libpng12-dev libgd2-xpm-dev groff)
+other_packages = %w(cmake libpng12-dev libgd-dev groff)
 other_packages.each do |package|
   `dpkg -s #{ package }` # just check the packages
 end

diff --git a/src/code-gen.rb b/src/code-gen.rb
@@ -113,7 +113,7 @@ def code
 class Pike < CodeGen
   File = "QR.pike"
   Cmd = "pike QR.pike > OUTFILE"
-  Apt = "pike7.8"
+  Apt = "pike8.0"
   Code = %q("int main(){write#{E[PREV]+R}}")
 end