Skip to content

Commit

Permalink
test: rename as compose.yml, ensure DNS config works
Browse files Browse the repository at this point in the history
  • Loading branch information
aksiksi committed Oct 14, 2024
1 parent f63fd63 commit 07cad03
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 6 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion nixos-test/docker-compose.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Auto-generated using compose2nix v0.3.1-pre.
# Auto-generated using compose2nix v0.3.2-pre.
{ pkgs, lib, ... }:

{
Expand Down
2 changes: 1 addition & 1 deletion nixos-test/podman-compose.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Auto-generated using compose2nix v0.3.1-pre.
# Auto-generated using compose2nix v0.3.2-pre.
{ pkgs, lib, ... }:

{
Expand Down
2 changes: 0 additions & 2 deletions nixos-test/test.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ let
sha256 = "sha256-yRDW3G/JA4WjVOul4zCHE/Xnpk+7qPGtkueiFje6EOE=";
};
common = {
# Container DNS.
networking.firewall.allowedUDPPorts = [ 53 ];
virtualisation.graphics = false;
virtualisation.oci-containers.containers."myproject-service-a".imageFile = nginxImage;
virtualisation.oci-containers.containers."service-b".imageFile = nginxImage;
Expand Down
4 changes: 2 additions & 2 deletions nixos-test/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ export TIMEZONE="America/New_York"
make build
bin/compose2nix \
-runtime=docker \
-inputs=nixos-test/docker-compose.yml \
-inputs=nixos-test/compose.yml \
-output=nixos-test/docker-compose.nix \
-check_systemd_mounts \
-include_env_files=true \
-generate_unused_resources=true \
-use_upheld_by
bin/compose2nix \
-runtime=podman \
-inputs=nixos-test/docker-compose.yml \
-inputs=nixos-test/compose.yml \
-output=nixos-test/podman-compose.nix \
-check_systemd_mounts \
-include_env_files=true \
Expand Down

0 comments on commit 07cad03

Please sign in to comment.