Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker Multistage for parallel build #3048

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
e243507
first version
th-2021 Dec 10, 2024
41d1b6d
move yarn to separate builder
th-2021 Dec 10, 2024
3f5deaa
switch to ruby binary image
th-2021 Dec 11, 2024
1bde047
move gitlab-shell to stage
th-2021 Dec 12, 2024
3586730
move out last build step gitlab-foss-build
th-2021 Dec 13, 2024
7ccd315
moved bundler install
th-2021 Dec 15, 2024
0374617
move resque/gitlab.yml copy; increase max_old_space
th-2021 Dec 15, 2024
95541c7
move database.yml
th-2021 Dec 15, 2024
ccbd775
fix uppercase
th-2021 Jan 1, 2025
42ea4fe
add env variable MAX_OLD_SPACE
th-2021 Jan 1, 2025
616e07f
add mutistage Dockerfile
th-2021 Jan 2, 2025
dd61ced
upgrade to 17.6.2; add architecture to go
th-2021 Jan 2, 2025
8383bf7
add libraries for source compile on arm64
th-2021 Jan 7, 2025
dffb90e
reenable go for final
th-2021 Jan 7, 2025
39e9854
remove unused variables
th-2021 Jan 7, 2025
d9f882d
set larger resource class; change to buildx; all for th-2021
th-2021 Jan 7, 2025
69af74d
add MAX_OLD_SPACE=8192
th-2021 Jan 8, 2025
bd8c135
echo MAX_OLD_SIZE
th-2021 Jan 8, 2025
06c7ee0
set max-old-space directly to 8192
th-2021 Jan 8, 2025
8362e0e
add parallelism
th-2021 Jan 8, 2025
6944ffd
remove parallelism; upgrade docker orb
th-2021 Jan 8, 2025
9a9ede5
use buildkit
th-2021 Jan 8, 2025
0562275
add buildkit parameter
th-2021 Jan 8, 2025
d722520
set buildkit variable
th-2021 Jan 8, 2025
738eecd
add image
th-2021 Jan 9, 2025
0fa2518
simplify
th-2021 Jan 9, 2025
2de835e
change back to better match master
th-2021 Jan 10, 2025
f066516
do a standard build for comparison
th-2021 Jan 10, 2025
a05eb3a
cleanup
th-2021 Jan 14, 2025
ea6a249
Merge branch 'sameersbn:master' into multistage
th-2021 Jan 19, 2025
9c8d5fd
Merge branch 'sameersbn:master' into multistage
th-2021 Jan 22, 2025
f4d4c80
update to 17.7.2
th-2021 Jan 22, 2025
d79753c
update to 17.8.0
th-2021 Jan 22, 2025
e9346d9
Merge branch 'sameersbn:master' into multistage
th-2021 Jan 23, 2025
1663c62
upgrade to 17.8.1.circleci/config.yml
th-2021 Jan 23, 2025
63ca554
build multistage
th-2021 Jan 23, 2025
876a1e1
copy GITSHELL_INSTALL_DIR as well
th-2021 Feb 1, 2025
085c73f
Merge branch 'sameersbn:master' into multistage
th-2021 Feb 23, 2025
31ab888
update to 17-9-0
th-2021 Feb 23, 2025
f4a3acc
sync with master 17.9.0
th-2021 Feb 23, 2025
2d8dfb8
upgrade ruby to 3.2.7
th-2021 Feb 23, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
moved bundler install
th-2021 committed Dec 15, 2024
commit 7ccd315b8efbebd43dd197beb49a392df4fcb72a
4 changes: 2 additions & 2 deletions Dockerfile.multistage
Original file line number Diff line number Diff line change
@@ -178,8 +178,8 @@ FROM gitlab-foss-source as ruby-inst-extended
COPY --from=ruby-inst /usr/local /usr/local

# install bundler: use version specified in Gemfile.lock
#RUN BUNDLER_VERSION="$(grep "BUNDLED WITH" $GITLAB_INSTALL_DIR/Gemfile.lock -A 1 | grep -v "BUNDLED WITH" | tr -d "[:space:]")" \
# gem install bundler:"$BUNDLER_VERSION"
RUN export BUNDLER_VERSION=$(grep "BUNDLED WITH" $GITLAB_INSTALL_DIR/Gemfile.lock -A 1 | grep -v "BUNDLED WITH" | tr -d "[:space:]"); echo $BUNDLER_VERSION; \
gem install bundler:"$BUNDLER_VERSION"

#----------------------------
# gitlab-shell
4 changes: 2 additions & 2 deletions assets/build/install2.sh
Original file line number Diff line number Diff line change
@@ -103,8 +103,8 @@ GITLAB_SHELL_VERSION=${GITLAB_SHELL_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_
GITLAB_PAGES_VERSION=${GITLAB_PAGES_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_PAGES_VERSION)}

# install bundler: use version specified in Gemfile.lock
BUNDLER_VERSION="$(grep "BUNDLED WITH" ${GITLAB_INSTALL_DIR}/Gemfile.lock -A 1 | grep -v "BUNDLED WITH" | tr -d "[:space:]")"
gem install bundler:"${BUNDLER_VERSION}"
#BUNDLER_VERSION="$(grep "BUNDLED WITH" ${GITLAB_INSTALL_DIR}/Gemfile.lock -A 1 | grep -v "BUNDLED WITH" | tr -d "[:space:]")"
#gem install bundler:"${BUNDLER_VERSION}"

# download golang
#echo "Downloading Go ${GOLANG_VERSION}..."