diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 3775dff..751165e 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -2,7 +2,7 @@ name: Build and Deploy on: push: - branches: [main] + branches: [main, decoupling] env: REGISTRY: registry.rose-ash.com:5000 @@ -36,8 +36,8 @@ jobs: run: | ssh "root@$DEPLOY_HOST" " cd ${{ env.REPO_DIR }} - git fetch origin main - git reset --hard origin/main + git fetch origin ${{ github.ref_name }} + git reset --hard origin/${{ github.ref_name }} git submodule update --init --recursive " diff --git a/.gitmodules b/.gitmodules index db171b9..b509b5a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ -[submodule "shared_lib"] - path = shared_lib +[submodule "shared"] + path = shared url = https://git.rose-ash.com/coop/shared.git + branch = decoupling diff --git a/Dockerfile b/Dockerfile index 2fd36c6..63d4801 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,14 +17,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ postgresql-client \ && rm -rf /var/lib/apt/lists/* -COPY shared_lib/requirements.txt ./requirements.txt +COPY shared/requirements.txt ./requirements.txt RUN pip install -r requirements.txt COPY . . -# Link app blueprints into the shared library's namespace -RUN rm -rf /app/shared_lib/suma_browser/app/bp && ln -s /app/bp /app/shared_lib/suma_browser/app/bp - # ---------- Runtime setup ---------- COPY entrypoint.sh /usr/local/bin/entrypoint.sh RUN chmod +x /usr/local/bin/entrypoint.sh diff --git a/shared b/shared new file mode 160000 index 0000000..4dd2552 --- /dev/null +++ b/shared @@ -0,0 +1 @@ +Subproject commit 4dd25526b9ddd2da7ab1dc125ed9d15e78cd74ac diff --git a/shared_lib b/shared_lib deleted file mode 160000 index 356d916..0000000 --- a/shared_lib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 356d916e26b7aeb86f0e684387108a04c499d337