diff --git a/.github/workflows/library-lua5.4.yaml b/.github/workflows/library-lua5.4.yaml index 06175200..1f4f321e 100644 --- a/.github/workflows/library-lua5.4.yaml +++ b/.github/workflows/library-lua5.4.yaml @@ -7,14 +7,14 @@ on: push: branches: [main] paths: - - 'library/lua5.4/**' + - 'library/lua/5.4/**' - '.github/workflows/library-lua5.4.yaml' pull_request: types: [opened, synchronize, reopened] branches: [main] paths: - - 'library/lua5.4/**' + - 'library/lua/5.4/**' - '.github/workflows/library-lua5.4.yaml' jobs: @@ -41,7 +41,7 @@ jobs: uses: unikraft/kraftkit@staging with: loglevel: debug - workdir: library/lua5.4 + workdir: library/lua/5.4 runtimedir: /github/workspace/.kraftkit plat: ${{ matrix.plat }} arch: ${{ matrix.arch }} diff --git a/.github/workflows/library-nginx1.15.yaml b/.github/workflows/library-nginx1.15.yaml index d322f59d..9698b359 100644 --- a/.github/workflows/library-nginx1.15.yaml +++ b/.github/workflows/library-nginx1.15.yaml @@ -7,14 +7,14 @@ on: push: branches: [main] paths: - - 'library/nginx1.15/**' + - 'library/nginx/1.15/**' - '.github/workflows/library-nginx1.15.yaml' pull_request: types: [opened, synchronize, reopened] branches: [main] paths: - - 'library/nginx1.15/**' + - 'library/nginx/1.15/**' - '.github/workflows/library-nginx1.15.yaml' jobs: @@ -41,7 +41,7 @@ jobs: uses: unikraft/kraftkit@staging with: loglevel: debug - workdir: library/nginx1.15 + workdir: library/nginx/1.15 runtimedir: /github/workspace/.kraftkit plat: ${{ matrix.plat }} arch: ${{ matrix.arch }} diff --git a/.github/workflows/library-python3.10.yaml b/.github/workflows/library-python3.10.yaml index 10b603a5..07e360b2 100644 --- a/.github/workflows/library-python3.10.yaml +++ b/.github/workflows/library-python3.10.yaml @@ -7,14 +7,14 @@ on: push: branches: [main] paths: - - 'library/python3.10/**' + - 'library/python/3.10/**' - '.github/workflows/library-python3.10.yaml' pull_request: types: [opened, synchronize, reopened] branches: [main] paths: - - 'library/python3.10/**' + - 'library/python/3.10/**' - '.github/workflows/library-python3.10.yaml' jobs: @@ -37,7 +37,7 @@ jobs: uses: unikraft/kraftkit@staging with: loglevel: debug - workdir: library/python3.10 + workdir: library/python/3.10 runtimedir: /github/workspace/.kraftkit plat: ${{ matrix.plat }} arch: ${{ matrix.arch }} diff --git a/.github/workflows/library-redis7.0.yaml b/.github/workflows/library-redis7.0.yaml index d20be537..f02ffb77 100644 --- a/.github/workflows/library-redis7.0.yaml +++ b/.github/workflows/library-redis7.0.yaml @@ -7,14 +7,14 @@ on: push: branches: [main] paths: - - 'library/redis7.0/**' + - 'library/redis/7.0/**' - '.github/workflows/library-redis7.0.yaml' pull_request: types: [opened, synchronize, reopened] branches: [main] paths: - - 'library/redis7.0/**' + - 'library/redis/7.0/**' - '.github/workflows/library-redis7.0.yaml' jobs: @@ -41,7 +41,7 @@ jobs: uses: unikraft/kraftkit@staging with: loglevel: debug - workdir: library/redis7.0 + workdir: library/redis/7.0 runtimedir: /github/workspace/.kraftkit plat: ${{ matrix.plat }} arch: ${{ matrix.arch }} diff --git a/.github/workflows/library-sqlite3.40.yaml b/.github/workflows/library-sqlite3.40.yaml index 107444f4..28eaa3af 100644 --- a/.github/workflows/library-sqlite3.40.yaml +++ b/.github/workflows/library-sqlite3.40.yaml @@ -7,14 +7,14 @@ on: push: branches: [main] paths: - - 'library/sqlite3.40/**' + - 'library/sqlite/3.40/**' - '.github/workflows/library-sqlite3.40.yaml' pull_request: types: [opened, synchronize, reopened] branches: [main] paths: - - 'library/sqlite3.40/**' + - 'library/sqlite/3.40/**' - '.github/workflows/library-sqlite3.40.yaml' jobs: @@ -41,7 +41,7 @@ jobs: uses: unikraft/kraftkit@staging with: loglevel: debug - workdir: library/sqlite3.40 + workdir: library/sqlite/3.40 runtimedir: /github/workspace/.kraftkit plat: ${{ matrix.plat }} arch: ${{ matrix.arch }} diff --git a/README.md b/README.md index de24666f..a44c9443 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ kraft pkg ls --apps --update | Status | Image | |-|-| | [![](https://github.com/unikraft/catalog/actions/workflows/library-helloworld.yaml/badge.svg)](https://github.com/unikraft/catalog/actions/workflows/library-helloworld.yaml) | [`unikraft.org/helloworld:latest`](library/helloworld) | -| [![](https://github.com/unikraft/catalog/actions/workflows/library-nginx1.15.yaml/badge.svg)](https://github.com/unikraft/catalog/actions/workflows/library-nginx1.15.yaml) | [`unikraft.org/nginx:1.15`](library/nginx1.15) | -| [![](https://github.com/unikraft/catalog/actions/workflows/library-python3.10.yaml/badge.svg)](https://github.com/unikraft/catalog/actions/workflows/library-python3.10.yaml) | [`unikraft.org/python:3.10`](library/python3.10) | -| [![](https://github.com/unikraft/catalog/actions/workflows/library-redis7.0.yaml/badge.svg)](https://github.com/unikraft/catalog/actions/workflows/library-redis7.0.yaml) | [`unikraft.org/redis:7.0`](library/redis7.0) | -| [![](https://github.com/unikraft/catalog/actions/workflows/library-lua5.4.yaml/badge.svg)](https://github.com/unikraft/catalog/actions/workflows/library-lua5.0.yaml) | [`unikraft.org/lua:5.4`](library/lua5.4) | +| [![](https://github.com/unikraft/catalog/actions/workflows/library-nginx1.15.yaml/badge.svg)](https://github.com/unikraft/catalog/actions/workflows/library-nginx/1.15.yaml) | [`unikraft.org/nginx:1.15`](library/nginx1.15) | +| [![](https://github.com/unikraft/catalog/actions/workflows/library-python3.10.yaml/badge.svg)](https://github.com/unikraft/catalog/actions/workflows/library-python/3.10.yaml) | [`unikraft.org/python:3.10`](library/python3.10) | +| [![](https://github.com/unikraft/catalog/actions/workflows/library-redis7.0.yaml/badge.svg)](https://github.com/unikraft/catalog/actions/workflows/library-redis/7.0.yaml) | [`unikraft.org/redis:7.0`](library/redis7.0) | +| [![](https://github.com/unikraft/catalog/actions/workflows/library-lua5.4.yaml/badge.svg)](https://github.com/unikraft/catalog/actions/workflows/library-lua/5.4.yaml) | [`unikraft.org/lua:5.4`](library/lua5.4) | diff --git a/library/lua5.4/Kraftfile b/library/lua/5.4/Kraftfile similarity index 100% rename from library/lua5.4/Kraftfile rename to library/lua/5.4/Kraftfile diff --git a/library/lua5.4/Makefile.uk b/library/lua/5.4/Makefile.uk similarity index 100% rename from library/lua5.4/Makefile.uk rename to library/lua/5.4/Makefile.uk diff --git a/library/lua5.4/README.md b/library/lua/5.4/README.md similarity index 100% rename from library/lua5.4/README.md rename to library/lua/5.4/README.md diff --git a/library/lua5.4/rootfs/helloworld.lua b/library/lua/5.4/rootfs/helloworld.lua similarity index 100% rename from library/lua5.4/rootfs/helloworld.lua rename to library/lua/5.4/rootfs/helloworld.lua diff --git a/library/nginx1.15/Kraftfile b/library/nginx/1.15/Kraftfile similarity index 100% rename from library/nginx1.15/Kraftfile rename to library/nginx/1.15/Kraftfile diff --git a/library/nginx1.15/rootfs/nginx/logs/error.log b/library/nginx/1.15/Makefile.uk similarity index 100% rename from library/nginx1.15/rootfs/nginx/logs/error.log rename to library/nginx/1.15/Makefile.uk diff --git a/library/nginx1.15/README.md b/library/nginx/1.15/README.md similarity index 100% rename from library/nginx1.15/README.md rename to library/nginx/1.15/README.md diff --git a/library/nginx1.15/rootfs/nginx/conf/mime.types b/library/nginx/1.15/rootfs/nginx/conf/mime.types similarity index 100% rename from library/nginx1.15/rootfs/nginx/conf/mime.types rename to library/nginx/1.15/rootfs/nginx/conf/mime.types diff --git a/library/nginx1.15/rootfs/nginx/conf/nginx.conf b/library/nginx/1.15/rootfs/nginx/conf/nginx.conf similarity index 100% rename from library/nginx1.15/rootfs/nginx/conf/nginx.conf rename to library/nginx/1.15/rootfs/nginx/conf/nginx.conf diff --git a/library/nginx1.15/rootfs/nginx/html/index.html b/library/nginx/1.15/rootfs/nginx/html/index.html similarity index 100% rename from library/nginx1.15/rootfs/nginx/html/index.html rename to library/nginx/1.15/rootfs/nginx/html/index.html diff --git a/library/python3.10/Dockerfile b/library/python/3.10/Dockerfile similarity index 100% rename from library/python3.10/Dockerfile rename to library/python/3.10/Dockerfile diff --git a/library/python3.10/Kraftfile b/library/python/3.10/Kraftfile similarity index 100% rename from library/python3.10/Kraftfile rename to library/python/3.10/Kraftfile diff --git a/library/python3.10/README.md b/library/python/3.10/README.md similarity index 100% rename from library/python3.10/README.md rename to library/python/3.10/README.md diff --git a/library/python3.10/helloworld.py b/library/python/3.10/helloworld.py similarity index 100% rename from library/python3.10/helloworld.py rename to library/python/3.10/helloworld.py diff --git a/library/redis7.0/Kraftfile b/library/redis/7.0/Kraftfile similarity index 100% rename from library/redis7.0/Kraftfile rename to library/redis/7.0/Kraftfile diff --git a/library/redis7.0/README.md b/library/redis/7.0/README.md similarity index 100% rename from library/redis7.0/README.md rename to library/redis/7.0/README.md diff --git a/library/redis7.0/rootfs/redis.conf b/library/redis/7.0/rootfs/redis.conf similarity index 100% rename from library/redis7.0/rootfs/redis.conf rename to library/redis/7.0/rootfs/redis.conf diff --git a/library/sqlite3.40/Kraftfile b/library/sqlite/3.40/Kraftfile similarity index 100% rename from library/sqlite3.40/Kraftfile rename to library/sqlite/3.40/Kraftfile diff --git a/library/sqlite3.40/Makefile.uk b/library/sqlite/3.40/Makefile.uk similarity index 100% rename from library/sqlite3.40/Makefile.uk rename to library/sqlite/3.40/Makefile.uk diff --git a/library/sqlite3.40/README.md b/library/sqlite/3.40/README.md similarity index 100% rename from library/sqlite3.40/README.md rename to library/sqlite/3.40/README.md diff --git a/library/sqlite3.40/rootfs/build.sql b/library/sqlite/3.40/rootfs/build.sql similarity index 100% rename from library/sqlite3.40/rootfs/build.sql rename to library/sqlite/3.40/rootfs/build.sql diff --git a/library/sqlite3.40/rootfs/music.db b/library/sqlite/3.40/rootfs/music.db similarity index 100% rename from library/sqlite3.40/rootfs/music.db rename to library/sqlite/3.40/rootfs/music.db diff --git a/library/sqlite3.40/rootfs/query.sql b/library/sqlite/3.40/rootfs/query.sql similarity index 100% rename from library/sqlite3.40/rootfs/query.sql rename to library/sqlite/3.40/rootfs/query.sql