Merge pull request #677 from ober/Fix-amazonlinux

Fix Amazonlinux docker and package

docker/Dockerfile

@@ -20,7 +20,14 @@ RUN case ${distro} in \
     cd /src && git clone --recurse-submodules https://github.com/google/leveldb.git && cd /src/leveldb && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && cmake --build . &&  mv libleveldb.a /usr/lib && \
     cd /src && git clone https://github.com/LMDB/lmdb && cd /src/lmdb/libraries/liblmdb && make && cd /src/lmdb/libraries/liblmdb && mv liblmdb.a /usr/lib \
     ;; \
-    amazonlinux|fedora) \
+    amazonlinux) \
+    amazon-linux-extras install epel -y && \
+    rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022 && \
+    yum install -y https://dev.mysql.com/get/mysql80-community-release-el7-3.noarch.rpm && \
+    yum update -y && yum groupinstall -y 'Development Tools' && \
+    eval yum install -y ${packages} \
+    ;; \
+    fedora) \
     yum update -y && yum groupinstall -y 'Development Tools' && \
     eval yum install -y ${packages} \
     ;; \
@@ -79,17 +86,7 @@ RUN cd /opt/gerbil-src/src && git fetch -a && git fetch --tags && git checkout $
     --enable-lmdb \
     --enable-mysql
 
-RUN cd /opt/gerbil-src/src && ./build.sh sanity-check
-RUN cd /opt/gerbil-src/src && ./build.sh gxi
-RUN cd /opt/gerbil-src/src && ./build.sh stage0
-RUN cd /opt/gerbil-src/src && ./build.sh stage1 final
-RUN cd /opt/gerbil-src/src && ./build.sh stdlib
-RUN cd /opt/gerbil-src/src && ./build.sh lang
-RUN cd /opt/gerbil-src/src && ./build.sh r7rs-large
-RUN cd /opt/gerbil-src/src && ./build.sh tools
-RUN cd /opt/gerbil-src/src && ./build.sh tags
-RUN cd /opt/gerbil-src/src && ./build.sh layout
-RUN cd /opt/gerbil-src/src && ./build.sh doc
+RUN cd /opt/gerbil-src/src && ./build.sh
 RUN cd /opt/gerbil-src/src && ./install
 
 FROM gerbil as final

docker/Makefile

@@ -36,14 +36,17 @@ alpine_packages := autoconf \
                    zlib-static
 
 amazon_packages := cmake \
+				   leveldb \
 				   leveldb-devel \
-                   libsqlite3x-devel \
-                   libxml2-devel \
+				   libsqlite3x-devel \
+				   libxml2-devel \
                    libyaml-devel \
+				   lmdb-libs \
                    lmdb-devel \
-                   mariadb-devel \
-                   mariadb-libs \
-                   openssl-devel \
+				   mysql-community-client \
+				   mysql-community-libs \
+				   mysql-community-devel \
+				   openssl-devel \
                    sqlite-devel
 
 fedora_packages := cmake \
@@ -138,15 +141,24 @@ ubuntu-current-jedi:
 package-ubuntu:
 	docker run -v $(PWD):/src -t gerbil/ubuntu \
     bash -c "gem install fpm && \
-	fpm -s dir -p /src/ -t deb -n gerbil-$(gerbil_version)-gambit-$(gambit_version).ubuntu \
+	fpm -s dir -p /src/ -t deb -n gerbil-$(GERBIL_VERSION)-gambit-$(GAMBIT_VERSION).ubuntu \
 	--description 'Gambit and Gerbil Package' /opt/gerbil /opt/gambit"
 
 package-fedora:
 	docker run -v $(PWD):/src -t gerbil/fedora \
 	bash -c "yum install -y rubygems ruby-devel rpm-build && \
 	gem install fpm && \
 	fpm -s dir -p /src/ -t rpm \
-	-n gerbil-$(gerbil_version)-gambit-$(gambit_version).fedora \
+	-n gerbil-$(GERBIL_VERSION)-gambit-$(GAMBIT_VERSION).fedora \
+	--description 'Gambit and Gerbil Package' /opt/gerbil /opt/gambit"
+
+package-amazonlinux:
+	docker run -v $(PWD):/src -t gerbil/amazonlinux \
+	bash -c "amazon-linux-extras install -y ruby2.6 && \
+    yum install -y ruby-devel rubygems rpm-build && \
+	gem install fpm && \
+	fpm -s dir -p /src/ -t rpm \
+	-n gerbil-$(GERBIL_VERSION)-gambit-$(GAMBIT_VERSION).amazonlinux \
 	--description 'Gambit and Gerbil Package' /opt/gerbil /opt/gambit"
 
 packages: package-ubuntu package-fedora