From 4f7162002c53f6cae3a66ebf9c758259dfb8e9da Mon Sep 17 00:00:00 2001 From: John David Pressman Date: Wed, 10 Jul 2019 00:28:25 -0700 Subject: [PATCH] Edit installation instructions to emphasize that Docker newbs should use the install script --- gitlab-pages/docs/setup/installation.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gitlab-pages/docs/setup/installation.md b/gitlab-pages/docs/setup/installation.md index 66cef54bb..a43ae9809 100644 --- a/gitlab-pages/docs/setup/installation.md +++ b/gitlab-pages/docs/setup/installation.md @@ -9,8 +9,18 @@ There are currently two ways to get started with Ligo, both of those will allow > 🐳 You can find instructions on how to install Docker [here](https://docs.docker.com/install/). +<<<<<<< HEAD Easiest way to use LIGO is through the Docker image available at [Docker Hub](https://hub.docker.com/r/ligolang/ligo). Sources for the image can be found on [Gitlab](https://gitlab.com/ligolang/ligo/blob/dev/docker/Dockerfile). You can either run the docker image yourself, or you can setup a global ligo executable as shown below. +======= +It's easiest to use LIGO through one of its Docker images. You have two options, +the first is to use our installation script to set up a globally available LIGO +executable (see below). This manages the Docker bits for you. The second +is to directly use the Docker image available at [Docker Hub](https://hub.docker.com/r/ligolang/ligo). +This lets you run multiple versions and keep your installation(s) self contained, but requires more familiarity with Docker. +Sources for the image can be found on [Gitlab](https://gitlab.com/ligolang/ligo/blob/master/docker/Dockerfile). +If this is your first time using Docker, you probably want to set up a global ligo executable as shown below. +>>>>>>> Edit installation instructions to emphasize that Docker newbs should use the install script ### Setting up a globally available `ligo` executable