diff --git a/.gitlab/ci/container-boot.gitlab-ci.yml b/.gitlab/ci/container-boot.gitlab-ci.yml index 46f6d1a..38d62c0 100644 --- a/.gitlab/ci/container-boot.gitlab-ci.yml +++ b/.gitlab/ci/container-boot.gitlab-ci.yml @@ -25,6 +25,7 @@ - SAGITTARIUS_VARIANT: - ce - ee + - cloud PLATFORM: - amd64 - arm64 diff --git a/.gitlab/ci/container-build.gitlab-ci.yml b/.gitlab/ci/container-build.gitlab-ci.yml index f7be117..e44110a 100644 --- a/.gitlab/ci/container-build.gitlab-ci.yml +++ b/.gitlab/ci/container-build.gitlab-ci.yml @@ -252,6 +252,7 @@ container:sagittarius: - VARIANT: - ce - ee + - cloud PLATFORM: - amd64 - arm64 @@ -264,6 +265,7 @@ manifest:sagittarius: - VARIANT: - ce - ee + - cloud needs: - generate-environment - job: container:sagittarius diff --git a/container/sagittarius/Dockerfile.erb b/container/sagittarius/Dockerfile.erb index 1d1325f..d978a48 100644 --- a/container/sagittarius/Dockerfile.erb +++ b/container/sagittarius/Dockerfile.erb @@ -39,12 +39,15 @@ COPY projects/sagittarius/config/ config/ COPY projects/sagittarius/lib/ lib/ COPY projects/sagittarius/db/ db/ COPY projects/sagittarius/app/ app/ -<% if ee? %> +<% if ee? || cloud? %> COPY projects/sagittarius/extensions/ee/app/ extensions/ee/app/ <% end %> +<% if cloud? %> +COPY projects/sagittarius/extensions/cloud/app/ extensions/cloud/app/ +<% end %> # Precompile bootsnap code for faster boot times -RUN bundle exec bootsnap precompile app/ lib/ <% if ee? %>extensions/ee/app/<% end %> +RUN bundle exec bootsnap precompile app/ lib/ <% if ee? || cloud? %>extensions/ee/app/<% end %> <% if cloud? %>extensions/cloud/app/<% end %> ARG RETICULUM_IMAGE_TAG=local RUN echo "$RETICULUM_IMAGE_TAG" > VERSION diff --git a/container/sagittarius/renderDockerfile b/container/sagittarius/renderDockerfile index e8a6eed..763f421 100755 --- a/container/sagittarius/renderDockerfile +++ b/container/sagittarius/renderDockerfile @@ -7,5 +7,9 @@ def ee? ENV['VARIANT'].eql?('ee') end +def cloud? + ENV['VARIANT'].eql?('cloud') +end + template = ERB.new(File.read("#{__dir__}/Dockerfile.erb"), trim_mode: '-') File.write("#{__dir__}/Dockerfile", template.result)