Skip to content

Commit

Permalink
Fix docker build, upgrade to lts-14.27
Browse files Browse the repository at this point in the history
  • Loading branch information
ad-si committed Feb 22, 2020
1 parent 258df47 commit 88e2c07
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
*

# Needed for retrieving the version number
!.git

!/docker-stack.yaml

!/tasklite-core
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ copy tasklite-core/package.yaml tasklite-core/package.yaml
run stack install --only-dependencies tasklite-core

copy tasklite-core tasklite-core

# Needed for retrieving the version number
copy .git .git

run stack install


Expand Down
2 changes: 1 addition & 1 deletion docker-stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-14.7
resolver: lts-14.27
packages:
- tasklite-core

Expand Down
18 changes: 16 additions & 2 deletions docs-source/installation/cli.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
# CLI Tool

## With Docker
## Prebuilt Binaries

The easiest way to get started is using the prebuilt Docker image:
Prebuilt binaries are available for macOS and Linux.

You can get them for each CI build on the
[GitHub Actions page](https://github.com/ad-si/TaskLite/actions).

The latest stable version is
[this build](https://github.com/ad-si/TaskLite/actions/runs/43430836).

On macOS make sure to download the artifacts with `curl` or `wget`
as macOS prevents the execution of files downloaded via a browser.


## Prebuilt Docker Image

Another easy way to get started is using the prebuilt Docker image:

```sh
docker run --rm adius/tasklite sh
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-14.7
resolver: lts-14.27
packages:
# - tasklite-api
- tasklite-app
Expand Down
8 changes: 4 additions & 4 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ packages:
url: https://github.com/JakeWheat/simple-sql-parser/archive/00433a26e8303c9e61359f406da5a2dbf1293fc8.tar.gz
snapshots:
- completed:
size: 523700
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/7.yaml
sha256: 8e3f3c894be74d71fa4bf085e0a8baae7e4d7622d07ea31a52736b80f8b9bb1a
original: lts-14.7
size: 524996
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/27.yaml
sha256: 7ea31a280c56bf36ff591a7397cc384d0dff622e7f9e4225b47d8980f019a0f0
original: lts-14.27

0 comments on commit 88e2c07

Please sign in to comment.