Skip to content

feat!: drop obsolete scripts #1014

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Jun 1, 2023
Merged

feat!: drop obsolete scripts #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4756333
feat!: drop obsolete scripts
viceice May 30, 2023
3395e93
test: fix tests
viceice May 30, 2023
adfa558
disable test
viceice May 31, 2023
7c67232
fix test
viceice May 31, 2023
a420b23
Update test/node/Dockerfile
viceice May 31, 2023
9b4cbcf
Merge remote-tracking branch 'origin/main' into feat/drop-scripts
viceice Jun 1, 2023
2a40547
fix test
viceice Jun 1, 2023
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
5 changes: 0 additions & 5 deletions src/usr/local/bin/install-buildpack
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions src/usr/local/bin/install-gem
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions src/usr/local/bin/install-npm
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions src/usr/local/bin/install-pip
View file
Open in desktop

This file was deleted.

23 changes: 6 additions & 17 deletions test/node/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ RUN npm --version
USER 0

# renovate: datasource=npm
RUN install-npm re2 1.16.0
RUN npm install -g re2@1.16.0

#--------------------------------------
# test: yarn
Expand Down Expand Up @@ -178,34 +178,23 @@ RUN npm --version
RUN npm --version | grep '7.24.2'

#--------------------------------------
# test: npm (npm i -g npm)
# test: unused
#--------------------------------------
FROM build as testf

USER root
# don't update!! need force to overwrite symlink
RUN npm i -gf npm@8.0.0

RUN set -ex; command -v npm; npm --version
RUN set -ex; npm --version | grep '8.0.0'

USER 1000
# don't update!!
RUN npm i -g npm@7.24.2
RUN set -ex; command -v npm; npm --version
RUN set -ex; npm --version | grep '7.24.2'
# unused


#--------------------------------------
# test: npm (install-npm npm)
# test: npm (npm install -g npm)
#--------------------------------------
FROM build as testg

SHELL [ "/bin/sh", "-c" ]

USER root
# don't update!!
RUN set -ex; install-npm npm 8.0.0
RUN set -ex; npm install -gf npm@8.0.0

RUN set -ex; command -v npm; npm --version
RUN set -ex; npm --version | grep '8.0.0'
Expand Down Expand Up @@ -491,7 +480,7 @@ COPY --from=testb /.dummy /.dummy
COPY --from=testc /.dummy /.dummy
COPY --from=testd /.dummy /.dummy
COPY --from=teste /.dummy /.dummy
COPY --from=testf /.dummy /.dummy
# COPY --from=testf /.dummy /.dummy
COPY --from=testg /.dummy /.dummy
COPY --from=testh /.dummy /.dummy
COPY --from=testi /.dummy /.dummy
Expand Down
2 changes: 1 addition & 1 deletion test/python/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ RUN set -ex; \
FROM build-rootless as testb

# renovate: datasource=pypi
RUN install-pip pipenv 2023.5.19
RUN install-tool pipenv 2023.5.19

RUN set -ex; \
cd a; \
Expand Down
37 changes: 4 additions & 33 deletions test/ruby/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ FROM build as test-bundler-b
RUN gem install bundler -v 1.17.2

# renovate: datasource=rubygems versioning=ruby
RUN install-gem bundler 2.4.13
RUN install-tool bundler 2.4.13

USER 1000

Expand Down Expand Up @@ -158,19 +158,11 @@ RUN set -ex; \
pod install;

#--------------------------------------
# test: global cocoapods (install-gem)
# test: unused
#--------------------------------------
FROM build3 as test-cocoapods-b

# renovate: datasource=rubygems versioning=ruby
RUN install-gem cocoapods 1.12.1

USER 1000

RUN set -ex; \
cd b/Project; \
gem install cocoapods-acknowledgements; \
pod install;
# unused


#--------------------------------------
Expand All @@ -185,26 +177,6 @@ RUN install-tool cocoapods 1.12.1

RUN pod env

RUN set -ex; \
cd b/Project; \
gem install cocoapods-acknowledgements; \
pod install;

#--------------------------------------
# test: cocoapods (install-gem, non-root)
#--------------------------------------
FROM base as test-cocoapods-d

RUN prepare-tool ruby

USER 1000

# renovate: datasource=github-releases packageName=containerbase/ruby-prebuild versioning=ruby
RUN install-tool ruby 3.2.2

# renovate: datasource=rubygems versioning=ruby
RUN install-gem cocoapods 1.12.1

RUN set -ex; \
cd b/Project; \
gem install cocoapods-acknowledgements; \
Expand All @@ -220,6 +192,5 @@ COPY --from=test-bundler-b /.dummy /.dummy
COPY --from=test-bundler-c /.dummy /.dummy
COPY --from=test-bundler-d /.dummy /.dummy
COPY --from=test-cocoapods-a /.dummy /.dummy
COPY --from=test-cocoapods-b /.dummy /.dummy
# COPY --from=test-cocoapods-b /.dummy /.dummy
COPY --from=test-cocoapods-c /.dummy /.dummy
COPY --from=test-cocoapods-d /.dummy /.dummy