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.

Sign up for GitHub

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

Fix Amazonlinux docker and package #677

Merged
merged 8 commits into from
Jul 5, 2022
Merged

Fix Amazonlinux docker and package #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
66617ac
break out amazon
ober Jul 5, 2022
49404b6
add epel
ober Jul 5, 2022
8e4c11f
fix for epel
ober Jul 5, 2022
d052f5e
get mysql-community-client installed
ober Jul 5, 2022
e2b0619
add package-amazonlinux
ober Jul 5, 2022
6e7507f
get mysql libs/devel
ober Jul 5, 2022
fce7b78
remove leftover
ober Jul 5, 2022
00d24a0
fixup amazonlinux package
ober Jul 5, 2022
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
21 changes: 9 additions & 12 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
;; \
Expand Down Expand Up @@ -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
Expand Down
26 changes: 19 additions & 7 deletions docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down