diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4cca12d994e23b9586517593b0fabfe631c3c01..44b8012618430e4b4cb03db2492c25eae3531301 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.inria.fr/control-for-computing/tutorial:doc +image: registry.gitlab.inria.fr/control-for-computing/tutorial/doc:v0.0 pages: script: diff --git a/README.md b/README.md index fa8b161ebaa3cdd1566a3fbcf68b8601b4512237..8f353b60d62c7e2a528fa6b3ca52ae1dd9d3a5e8 100644 --- a/README.md +++ b/README.md @@ -6,5 +6,5 @@ docker run --privileged -it -v $(pwd):/data guilloteauq/tuto-ctrl-docker:july202 ```bash -docker run -it -p 8888:8888 -v $(pwd):/data guilloteauq/tuto-ctrl-py:jan2023 tuto_part1.ipynb +docker run -it -p 8888:8888 -v $(pwd):/tuto/data registry.gitlab.inria.fr/control-for-computing/tutorial/tuto:v0.0 ``` diff --git a/flake.nix b/flake.nix index 8b61f3a5a1a93fc3f8ae4f2590504c811f62ae84..01427f072eff267e8d3bd4eae39bea06fe7774b9 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ let system = "x86_64-linux"; pkgs = import nixpkgs { inherit system; }; + version = "v0.0"; flakeImage = pkgs.dockerTools.pullImage { imageName = "nixpkgs/nix-flakes"; @@ -21,7 +22,7 @@ packages.${system} = rec { tuto = pkgs.stdenv.mkDerivation { name = "tuto-ctrl"; - src = ./src_real_data; + src = ./src_real_system; buildInputs = [ pkgs.gcc pkgs.lua5_4 @@ -39,7 +40,7 @@ tuto_control_lib = pkgs.python3Packages.buildPythonPackage { name = "tuto_control_lib"; - version = "1.0"; + inherit version; src = ./tuto_control_lib; propagatedBuildInputs = with pkgs.python3Packages; [ # ... @@ -49,8 +50,8 @@ }; tuto-py-docker = pkgs.dockerTools.buildImage { - name = "guilloteauq/tuto-ctrl-py"; - tag = "jan2023"; + name = "registry.gitlab.inria.fr/control-for-computing/tutorial/tuto"; + tag = version; contents = [ (pkgs.python3.withPackages (ps: with ps; with pkgs.python3Packages; [ jupyterlab @@ -61,6 +62,7 @@ runAsRoot = '' mkdir -p /tuto + mkdir -p /tuto/data ln -s ${./jupyter_notebooks}/*.ipynb /tuto ''; config = { @@ -69,13 +71,13 @@ "8888/tcp" = { }; }; WorkingDir = "/tuto"; - Volumes = { "/data" = { }; }; + Volumes = { "/tuto/data" = { }; }; }; }; - tuto-docker = pkgs.dockerTools.buildImage { - name = "guilloteauq/tuto-ctrl-docker"; - tag = "july2022"; + tuto-system-docker = pkgs.dockerTools.buildImage { + name = "registry.gitlab.inria.fr/control-for-computing/tutorial/system"; + tag = version; contents = [ tuto ]; @@ -100,9 +102,9 @@ ''; }; - imageCIdoc = pkgs.dockerTools.buildImageWithNixDb { - name = "registry.gitlab.inria.fr/control-for-computing/tutorial"; - tag = "doc"; + tuto-doc-docker = pkgs.dockerTools.buildImageWithNixDb { + name = "registry.gitlab.inria.fr/control-for-computing/tutorial/doc"; + tag = version; fromImage = flakeImage; contents = with pkgs; [ mdbook mdbook-mermaid mdbook-admonish ]; # mdbook-linkcheck pour checker la validiter des liens }; diff --git a/update_and_push_docker_images.sh b/update_and_push_docker_images.sh new file mode 100644 index 0000000000000000000000000000000000000000..1f37201edc3422d947137f97c0dea3aa2d5fe950 --- /dev/null +++ b/update_and_push_docker_images.sh @@ -0,0 +1,14 @@ + +VERSION=$1 + +nix build .#tuto-py-docker +docker load < result +docker push registry.gitlab.inria.fr/control-for-computing/tutorial/tuto:$VERSION + +nix build .#tuto-system-docker +docker load < result +docker push registry.gitlab.inria.fr/control-for-computing/tutorial/system:$VERSION + +nix build .#tuto-doc-docker +docker load < result +docker push registry.gitlab.inria.fr/control-for-computing/tutorial/doc:$VERSION