From 804281b206ee25092a23774554f467666f370a78 Mon Sep 17 00:00:00 2001 From: Tom Jack Date: Tue, 1 Oct 2019 09:21:01 -0500 Subject: [PATCH] Copy debian packages into gitlab-pages --- .gitlab-ci.yml | 3 +++ gitlab-pages/docs/setup/installation.md | 12 +++++++++--- gitlab-pages/website/static/deb/.gitignore | 1 + scripts/distribution/generic/package.sh | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 gitlab-pages/website/static/deb/.gitignore diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19e5d7f6a..9589ea238 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,6 +43,9 @@ stages: # build with odoc - dune build @doc + # copy .deb packages into website + - find dist -name \*.deb -exec sh -c 'cp {} gitlab-pages/website/static/deb/ligo_$(basename $(dirname {})).deb' \; + # npm - cd gitlab-pages/website - npm install diff --git a/gitlab-pages/docs/setup/installation.md b/gitlab-pages/docs/setup/installation.md index c9b5c5503..e607b3c32 100644 --- a/gitlab-pages/docs/setup/installation.md +++ b/gitlab-pages/docs/setup/installation.md @@ -3,7 +3,7 @@ id: installation title: Installation --- -There are currently two ways to get started with Ligo, both of those will allow you to use the Ligo CLI with your contracts. You can choose to use either a Docker image, or to compile & build the Ligo CLI yourself. +There are currently two ways to get started with Ligo. You can choose to either use a Docker image, or to install packages for your Debian Linux distribution. ## Dockerized installation (recommended) @@ -38,6 +38,12 @@ ligo --help ``` -## Manual installation (advanced) +## Debian Linux package installation + +We have produced .deb packages for a few Debian Linuxes. They will install a global `ligo` executable. You can install them in the usual way. + +- [Ubuntu 18.04](/deb/ligo_ubuntu-18.04.deb) +- [Ubuntu 19.04](/deb/ligo_ubuntu-19.04.deb) +- [Debian 9](/deb/ligo_debian-9.deb) +- [Debian 10](/deb/ligo_debian-10.deb) -For now, please refer to the steps described in the [Dockerfile](https://gitlab.com/ligolang/ligo/blob/master/docker/Dockerfile). \ No newline at end of file diff --git a/gitlab-pages/website/static/deb/.gitignore b/gitlab-pages/website/static/deb/.gitignore new file mode 100644 index 000000000..72e8ffc0d --- /dev/null +++ b/gitlab-pages/website/static/deb/.gitignore @@ -0,0 +1 @@ +* diff --git a/scripts/distribution/generic/package.sh b/scripts/distribution/generic/package.sh index b00b61841..79be37d41 100755 --- a/scripts/distribution/generic/package.sh +++ b/scripts/distribution/generic/package.sh @@ -14,7 +14,7 @@ if [ -n "$dockerfile" ]; then docker build --build-arg targetBuildImage="$tag_build" --build-arg version="$version" -t "$tag_package" -f "$dockerfile" . # Copy the package to host's (our own) file system mkdir -p "$PWD/dist/package/$target" - docker run -v $PWD:$PWD "$tag_package" cp -r /package/dist/. "$PWD/dist/package/$target" + docker run --entrypoint '/bin/sh' -v $PWD:$PWD "$tag_package" -c "cp -r /package/dist/. $PWD/dist/package/$target" else echo "Dockerfile not found for target: $target" -fi \ No newline at end of file +fi