Commit Graph

250 Commits

Author SHA1 Message Date
Robert Hensing
92c389fab5 Fix tests 2020-10-10 22:14:22 +02:00
Robert Hensing
2de4188b9d Update options 2020-10-10 22:12:37 +02:00
Robert Hensing
df0ec2eb50 Add name option for project/composition name 2020-10-10 22:09:35 +02:00
Robert Hensing
427a3b0e3c
Merge pull request #103 from hercules-ci/streamlayer
Add dockerTools.streamLayeredImage support
2020-10-02 13:00:10 +02:00
Robert Hensing
067ce26177 Use dockerTools.streamLayeredImage if available
Technically this opens a new attack vector, but if you don't trust
the code you're deploying, you should already have taken precautions
because of nix-shell, direnv etc. This just adds arion to that list.
2020-10-02 11:52:35 +02:00
Robert Hensing
88c361c81c Rename getDockerImages 2020-10-02 11:52:35 +02:00
Robert Hensing
fa06bc80dc examples/minimal: Speed up shutdown 2020-10-02 11:52:35 +02:00
Robert Hensing
b4c17aac7c
Merge pull request #102 from hercules-ci/prebuilt
Prebuilt
2020-10-01 19:43:56 +02:00
Robert Hensing
7c20fa9a11 Support use of prebuilt docker-compose.yaml 2020-10-01 18:47:29 +02:00
Robert Hensing
9dabd9bb92 Remove broken live-check script, use ./build 2020-10-01 16:53:04 +02:00
Robert Hensing
f7d2f2d93c Add Haskell Language Server support
vscode:
  - use Nix Environment Selector (with shell.nix)
  - install haskell.haskell extension
2020-10-01 16:52:19 +02:00
Robert Hensing
5df15b33a7
Merge pull request #99 from hercules-ci/update
Update
2020-10-01 15:49:16 +02:00
Robert Hensing
3e3c1754a5 Work around nginx problem in 20.03 2020-10-01 15:38:01 +02:00
Robert Hensing
ed2bc14032 Add nixos-20.09 2020-10-01 11:58:43 +02:00
Robert Hensing
97df92183d nixos-20.03: update 2020-10-01 11:54:15 +02:00
Robert Hensing
fd41e1e7de Increase test memory 2020-09-05 23:02:21 +02:00
Robert Hensing
b2e2aad1d5 Fix warning 2020-09-05 23:02:11 +02:00
Robert Hensing
90c2637947 Update 2020-09-05 23:00:30 +02:00
Robert Hensing
7609d3a88d Bump to v0.1.1.1 2020-03-20 22:39:52 +01:00
Robert Hensing
4afa8694f6
Merge pull request #95 from hercules-ci/maintenance
Maintenance
2020-03-20 22:37:39 +01:00
Robert Hensing
3b86679399 Resolve NonEmpty import warning 2020-03-20 22:28:46 +01:00
Robert Hensing
eeed0577be haskell: Resolve lines ambiguity 2020-03-20 22:28:37 +01:00
Robert Hensing
313bf21228 arion-compose.cabal: Allow newer base up to a point 2020-03-20 22:24:22 +01:00
Robert Hensing
7d6ddb960f arion-compose.cabal: Allow all newer base 2020-03-20 21:45:45 +01:00
Robert Hensing
5670a09cac Bump to v0.1.1.0 2020-03-19 12:27:07 +01:00
Robert Hensing
d92eb8ada5
Merge pull request #94 from hercules-ci/update-nixos-20.03
Update for nixos 20.03
2020-03-19 12:18:18 +01:00
Robert Hensing
5c318409cc Revert nixos-19.09 due to broken python docker on darwin 2020-03-19 12:12:09 +01:00
Robert Hensing
265f6a29ce ci.nix: Disable nixos-unstable 2020-03-19 12:12:09 +01:00
Robert Hensing
fc2ec12ead Update 2020-03-19 12:12:09 +01:00
Robert Hensing
52dfbeccb1 Adapt to 20.03
- Migrate tests to python-based runner for newer nixpkgs.
 - Adaptations for newer nginx module used in tests
 - Increase memory size for tests
2020-03-19 12:12:09 +01:00
Matt Schreiber
5bd7ea2aa3 Clean up "work" directory before "arion up"
to ensure that the subtests defined in tests/arion-test/default.nix do
not inadvertently re-use the arion-compose.nix, arion-pkgs.nix, etc. set
up during the _previous_ subtest.

Previously, each subtest attempted to clean itself up by doing
the following:

    cd work && [...snip...] && rm -rf work

This removes the directory "work/work", while leaving "work" itself
intact.  Subsequent subtests would then run:

    cp -r ${../../examples/some-example} work

thereby copying the contents of "some-example" into "work/work" rather
than into "work".

As a result, all subtests but the first simply reapplied the Arion
configuration set up by the first subtest, because this configuration
persisted within the "work" directory used as the working directory for
"arion up", etc.

This commit corrects the issue by:

    1. Removing "work" rather than "work/work", and
    2. Adding certain flags to the "cp" invocation to ensure it reliably
       copies files into "work" rather than "work/work": (a) "-f"
       ("--force"), to overwrite destination files if they already
       exist, and (b) "-T" ("--no-target-directory") to copy the
       *contents* of the source directory to "work" rather than copying
       the source directory itself as a subdirectory of "work".

Additionally, this commit factors out code common to all subtests into a
reusable subtest generator coderef.
2020-03-19 12:04:04 +01:00
Robert Hensing
41d3fb490c sources.nixpkgs: 19.03 -> 20.03 2020-03-19 12:04:04 +01:00
Robert Hensing
1778d76117 arion-base: buildLayeredImage -> buildImage to avoid build error
buildLayeredImage doesn't work when the number of nix store layers is 0.
This may be fixed by pull https://github.com/NixOS/nixpkgs/pull/80921/files
but meanwhile, plain buildImage will do the job.
2020-02-24 00:46:26 +01:00
Robert Hensing
77b89cb424 Merge branch 'fix-doc-formatting' 2019-10-29 13:02:49 +01:00
Robert Hensing
0a8f8e7fb8 Fix doc formatting 2019-10-29 12:52:00 +01:00
Robert Hensing
24503bcbe5 Fix warnings 2019-10-29 11:04:25 +01:00
Robert Hensing
697b3a27bb
Update index.adoc 2019-10-28 23:52:59 +01:00
Domen Kožar
8f2b953701
Merge pull request #87 from hercules-ci/enable-darwin-build
ci.nix: Enable darwin build
2019-10-27 11:50:38 +01:00
Robert Hensing
c38c374fa6 Work around Nix enforcing cross-system fetch bug
https://github.com/hercules-ci/hercules-ci-agent/issues/168
2019-10-27 11:42:40 +01:00
Robert Hensing
dda66e104e Fix test 2019-10-26 15:37:24 +02:00
Robert Hensing
4cc75b7cc5 ci.nix: Enable darwin build 2019-10-26 15:27:32 +02:00
Robert Hensing
3580fef52e
Update README.asciidoc 2019-10-25 13:29:11 +02:00
bors[bot]
1ed2161bcd
Merge #85
85: Use antora for documentation r=roberth a=domenkozar

Fixes #10

Co-authored-by: Domen Kožar <domen@dev.si>
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Co-authored-by: Robert Hensing <robert@roberthensing.nl>
2019-10-24 23:13:58 +00:00
Robert Hensing
4a12286e92 docs: Fake repo for CI 2019-10-25 01:10:01 +02:00
Robert Hensing
da83692996 docs: Use lib.evalModules 2019-10-25 01:10:01 +02:00
Robert Hensing
60f3f34527 Rename module-composition -> modules 2019-10-25 00:32:59 +02:00
Robert Hensing
2856bbbe7f
Update antora-playbook.yml 2019-10-25 00:13:41 +02:00
Robert Hensing
09f324bfe0
Update README.asciidoc 2019-10-25 00:13:13 +02:00
Domen Kožar
5140cf0a09
Use antora for documentation 2019-10-25 00:11:35 +02:00
Domen Kožar
4444cf1856
nix/overlay.nix: fix eval 2019-10-24 16:25:57 +02:00