ghoscht/arion
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
250 commits 31 branches 7 tags 924 KiB
Commit graph

250 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robert Hensing
00f7b3e711 Make the service name available to the service config 2019-03-11 14:44:18 +01:00
Robert Hensing
6fd435c38e
Merge pull request #25 from hercules-ci/nixos-in-container 
NixOS in container
 2019-03-06 14:55:45 +01:00
Robert Hensing
97d58f7bd3 Rename nixos.useInit -> nixos.useSystemd 2019-03-06 12:49:39 +01:00
Robert Hensing
a5e08b23a3 Add service.useHostNixDaemon 2019-03-05 19:42:32 +01:00
Robert Hensing
c5e6fe6e5f Remove redundant buildInput 2019-03-05 19:42:10 +01:00
Robert Hensing
35a309097a Add support for NixOS inside containers 2019-03-05 19:41:54 +01:00
Domen Kožar
d63026ce42
Merge pull request #23 from hercules-ci/documentation 
Add doc/manual, tweak README
 2019-03-04 10:36:41 +07:00
Robert Hensing
6b5d0b988d doc/manual: Hide internals by default 2019-03-04 00:37:49 +01:00
Serhii Khoma
0637a1ace9 Add and fix some service fields 
I had to do a manual rebase.
The hard work was done by srghma. Thanks!
 2019-03-04 00:33:53 +01:00
Robert Hensing
c132b53527 doc/manual: Update shell build 2019-03-04 00:24:22 +01:00
Robert Hensing
cf562d6234 Move build.service option to top 2019-03-04 00:13:57 +01:00
Robert Hensing
dc762a79bf Use the right string type 2019-03-04 00:13:01 +01:00
Robert Hensing
ccaac02a87 Add doc/manual, tweak README 2019-03-03 23:42:40 +01:00
Robert Hensing
da85a4cbbe
Merge pull request #21 from hercules-ci/composition-level-environment 
Host environment
 2019-02-13 15:10:00 +01:00
Robert Hensing
c03ca68795 Move uid and customNixRootPath into config.host module 
Also make the type of host.uid consistently int.
 2019-02-13 18:36:10 +07:00
Robert Hensing
359c8b601d Move modules into modules/{composition,service} 2019-02-13 17:33:19 +07:00
Robert Hensing
3714883723 Merge remote-tracking branch 'srghma/custom-nix-store' into composition-level-environment 2019-02-13 17:10:14 +07:00
Serhii Khoma
59f97876e3 feat: custom nix store 2019-02-13 11:04:17 +02:00
Robert Hensing
1044cc3e01
Merge pull request #19 from srghma/myfixes 
docker-config -> add missing fields
 2019-02-04 08:15:00 +01:00
Serhii Khoma
57d5370e76 feat: docker-config -> add missing fields -> links, external_links, extra_hosts 2019-02-03 22:36:26 +02:00
Serhii Khoma
20651e8739 feat: docker-config -> add missing fields -> priviliged and hostname 2019-02-03 22:36:26 +02:00
Robert Hensing
cb25b976ff
Update README.md 2019-01-28 16:13:36 +01:00
Robert Hensing
2324223360
Merge pull request #17 from hercules-ci/fix-other-linux-bin-sh 
Replace /bin/sh, /usr/bin/env mounts by symlinks
 2019-01-28 16:09:50 +01:00
Robert Hensing
25a12585a3
Merge pull request #16 from hercules-ci/ignore-path-docker-compose 
Always ignore PATH docker-compose
 2019-01-28 16:09:30 +01:00
Robert Hensing
4a6b2a0078
Add cd command to README.md Install section 2019-01-27 01:15:05 +01:00
Robert Hensing
e92a0dce06 Fix integration test 2019-01-27 01:08:51 +01:00
Robert Hensing
89f5622f2e Replace /bin/sh, /usr/bin/env mounts by symlinks 
This makes the arion-base image compatible with hosts other than
NixOS.
 2019-01-26 23:50:05 +01:00
Robert Hensing
c490768e29 Always ignore PATH docker-compose 
Arion used to prefer an external docker-compose, but that exposes
users to potential incompatibilities.

For example, the docker-compose on Ubuntu 18.04 (LTS) doesn't seem
to handle Dockerfiles in the Nix store properly.
 2019-01-26 23:41:42 +01:00
Robert Hensing
bb5a8810e8
Merge pull request #15 from hercules-ci/issue-7-rename-to-composition 
Use the word 'composition' where applicable.
 2019-01-20 17:35:34 +01:00
Robert Hensing
23ee554f2f Use the word 'composition' where applicable. 
Also adds some documentation to celebrate that we can now - with ease - verbally
distinguish between composition-level modules and service-level modules.
 2019-01-20 17:29:15 +01:00
Robert Hensing
e7ad732bb3
Merge pull request #14 from hercules-ci/issue-5 
Pin and make the project structure conform more to todomvc-nix
 2019-01-20 17:14:06 +01:00
Robert Hensing
8dfb1c01ce
Merge pull request #13 from hercules-ci/fix-import-from-derivation 
Make import from derivation work again
 2019-01-20 17:13:41 +01:00
Robert Hensing
76ca66f59c Pin and make the project structure conform more to todomvc-nix 
This makes the Nix files work like todomvc-nix but a little simplified.
Also it pins nixpkgs because for development (tests), you need -unstable
instead of release-18.09 so that's automatic now.
 2019-01-20 17:11:18 +01:00
Robert Hensing
313a65c914 Make import from derivation work again 
Broken by f503e556ea
Fixes #12

Cause of the problem:
nix-instantiate uses the store in read-only mode by default, unlike
nix-build.
Import from derivation requires a read-write store, causing the
command to fail with a (bad) error message. This only happened when
the derivation wasn't already built. This did not occur often
because commands like arion up use nix-build and therefore typically
mask the problem on subsequent invocations.

To reproduce the problem, garbage collect, then arion ps.
 2019-01-20 15:18:29 +01:00
Robert Hensing
93346145cd
Merge pull request #11 from srghma/master 
feat: docker-config -> add missing fields
 2019-01-13 21:31:00 +01:00
Sergei Khoma
380ae56e4f feat: docker-config -> add missing fields 2019-01-13 16:24:56 +02:00
Robert Hensing
da7091c37b
Merge pull request #4 from hercules-ci/itest 
Add integration test
 2019-01-02 16:45:38 +01:00
Robert Hensing
0af009c38d Make docker-compose an included dependency 2019-01-02 10:10:28 +01:00
Robert Hensing
c39d7db5cd Add integration test 
Tests the minimal example, up command, network connectivity.
Introduces overlay.
 2019-01-02 09:54:46 +01:00
Robert Hensing
ebb714c69d Merge branch 'master' of github.com:hercules-ci/arion 2018-12-23 13:07:10 +01:00
Robert Hensing
f503e556ea Do not build for commands that do not need images 2018-12-23 13:00:04 +01:00
Domen Kožar
31808b1315
README: styling 2018-12-18 14:09:43 +00:00
Robert Hensing
0f6a1bd41f Doc improvements 2018-12-18 14:53:37 +01:00
Robert Hensing
9297411d40 README.md: Add examples and answers 2018-12-18 13:27:57 +01:00
Robert Hensing
bcc0f6e948
Merge pull request #2 from zimbatm/shellcheck 
fixes shellcheck issues
 2018-12-18 10:49:50 +01:00
zimbatm
980faa4ea0
fixes shellcheck issues 
mainly escaping
 2018-12-18 10:47:42 +01:00
Robert Hensing
acb626aada
Update README.md 2018-12-18 10:30:42 +01:00
Robert Hensing
11f1f521ea Add Apache 2.0 LICENSE 2018-12-17 19:11:27 +01:00
Robert Hensing
c90a975d9f .gitignore: Ignore Nix result, result-* 2018-12-17 19:10:26 +01:00
Robert Hensing
dc294b034e Code taken from Hercules CI repo 
- renamed to Arion
 - minor changes
 - readme WIP
 2018-12-17 19:08:38 +01:00