diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8fd8579..3667094 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,3 @@ -variables: - IMAGE_NAME: busynix:${CI_COMMIT_TAG:-latest} - stages: - release @@ -19,6 +16,13 @@ docker-dist: } }" > /kaniko/.docker/config.json script: - - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $IMAGE_NAME + - | + if [ -n "$CI_COMMIT_TAG" ]; then + IMAGE_NAME=busynix:$CI_COMMIT_TAG + else + IMAGE_NAME=busynix:latest + fi + DEST=CI_REGISTRY/$IMAGE_NAME + - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $DEST diff --git a/Dockerfile b/Dockerfile index 788411a..f5f22f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,5 +10,7 @@ RUN nix-env -iA nixpkgs.neovim RUN nix-env -iA nixpkgs.fish RUN nix-env -iA nixpkgs.pgcli RUN nix-env -iA nixpkgs.redis +RUN nix-env -iA nixpkgs.busybox -RUN /bin/sh +WORKDIR /data +CMD httpd -f -p 8000 -h /data