Skip to content

Commit

Permalink
docker: remove misleading comments, fix gz ending
Browse files Browse the repository at this point in the history
The files must be run through the Flake (script) now.
Nixpkgs builds tar.gz, our filename was wrong.
  • Loading branch information
dpausp committed Oct 24, 2023
1 parent fbbd820 commit 20fbc4a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 16 deletions.
4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,14 @@
echo "Tested with VSCode, Pycharm."
'';
build_docker_app.exec = ''
out=docker-image-ekklesia-portal.tar
out=docker-image-ekklesia-portal.tar.gz
nix build .#docker -o $out
echo "Built container image for the application".
echo "Load the image with:"
echo "docker load -i $out"
'';
build_docker_static.exec = ''
out=docker-image-ekklesia-portal-static.tar
out=docker-image-ekklesia-portal-static.tar.gz
nix build .#dockerStatic -o $out
echo "Built container image for the static files (assets)".
echo "Load the image with:"
Expand Down
8 changes: 1 addition & 7 deletions nix/docker.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
#!/usr/bin/env -S nix-build -o docker-image-ekklesia-portal.tar
# Run this file: ./docker.nix
# It creates a docker image archive called docker-image-ekklesia-portal.tar.
# Default tag is the git version. You can set a custom tag with:
# ./docker.nix --argstr tag mytag
# Import into docker with:
# docker load -i docker-image-ekklesia-portal.tar
{ pkgs, serveApp }:

let
Expand All @@ -17,6 +10,7 @@ in
pkgs.dockerTools.buildLayeredImage {
name = "ekklesia-portal";
contents = [ passwd ];

config = {
ExposedPorts = { "8080/tcp" = { }; };
User = user;
Expand Down
7 changes: 0 additions & 7 deletions nix/docker_static.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
#!/usr/bin/env -S nix-build -o docker-image-ekklesia-portal-static.tar
# Run this file: ./docker_static.nix.
# Default tag is the git version. You can set a custom tag with:
# ./docker_static.nix --argstr tag mytag
# It creates a docker image archive called docker-image-ekklesia-portal-static.tar.
# Import into docker with:
# docker load -i docker-image-ekklesia-portal-static.tar
{ pkgs, serveStatic }:

let
Expand Down

0 comments on commit 20fbc4a

Please sign in to comment.