File tree Expand file tree Collapse file tree 4 files changed +32
-16
lines changed Expand file tree Collapse file tree 4 files changed +32
-16
lines changed Original file line number Diff line number Diff line change @@ -33,10 +33,14 @@ COPY metadata.json ./
3333
3434# Installing dependencies from source. These versions should be within the range
3535# of `dependencies` in metadata.json.
36- RUN git clone --depth 1 https://github.com/puppetlabs/puppetlabs-stdlib ../stdlib --branch v9.7.0
37- RUN git clone --depth 1 https://github.com/puppetlabs/puppetlabs-inifile ../inifile --branch v6.2.0
38- RUN git clone --depth 1 https://github.com/puppetlabs/puppetlabs-apt ../apt --branch v10.0.1
39- RUN git clone --depth 1 https://github.com/puppetlabs/puppetlabs-facts ../facts --branch 1.7.0
36+ RUN git clone --tags https://github.com/puppetlabs/puppetlabs-stdlib ../stdlib && \
37+ $(cd ../stdlib && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
38+ RUN git clone --tags https://github.com/puppetlabs/puppetlabs-inifile ../inifile && \
39+ $(cd ../inifile && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
40+ RUN git clone --tags https://github.com/puppetlabs/puppetlabs-apt ../apt && \
41+ $(cd ../apt && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
42+ RUN git clone --tags https://github.com/puppetlabs/puppetlabs-facts ../facts && \
43+ $(cd ../facts && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
4044
4145# Now move the project directory's files into the image. That way, if these
4246# files change, caching will skip everything before this.
Original file line number Diff line number Diff line change @@ -27,10 +27,14 @@ COPY metadata.json ./
2727
2828# Installing dependencies from source. These versions should be within the range
2929# of `dependencies` in metadata.json.
30- RUN git clone --depth 1 https://github.com/puppetlabs/puppetlabs-stdlib ../stdlib --branch v9.7.0
31- RUN git clone --depth 1 https://github.com/puppetlabs/puppetlabs-inifile ../inifile --branch v6.2.0
32- RUN git clone --depth 1 https://github.com/puppetlabs/puppetlabs-apt ../apt --branch v10.0.1
33- RUN git clone --depth 1 https://github.com/puppetlabs/puppetlabs-facts ../facts --branch 1.7.0
30+ RUN git clone --tags https://github.com/puppetlabs/puppetlabs-stdlib ../stdlib && \
31+ $(cd ../stdlib && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
32+ RUN git clone --tags https://github.com/puppetlabs/puppetlabs-inifile ../inifile && \
33+ $(cd ../inifile && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
34+ RUN git clone --tags https://github.com/puppetlabs/puppetlabs-apt ../apt && \
35+ $(cd ../apt && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
36+ RUN git clone --tags https://github.com/puppetlabs/puppetlabs-facts ../facts && \
37+ $(cd ../facts && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
3438
3539# Now move the project directory's files into the image. That way, if these
3640# files change, caching will skip everything before this.
Original file line number Diff line number Diff line change @@ -70,10 +70,14 @@ RUN /opt/puppetlabs/puppet/bin/puppet module install --modulepath $module_path -
7070
7171# Installing dependencies from source. These versions should be within the range
7272# of `dependencies` in metadata.json.
73- # RUN git clone https://github.com/puppetlabs/puppetlabs-stdlib ../stdlib --branch 9.7.0
74- # RUN git clone https://github.com/puppetlabs/puppetlabs-inifile ../inifile --branch 6.2.0
75- # RUN git clone https://github.com/puppetlabs/puppetlabs-apt ../apt --branch 10.0.1
76- # RUN git clone https://github.com/puppetlabs/puppetlabs-facts ../facts --branch 1.7.0
73+ # RUN git clone --tags https://github.com/puppetlabs/puppetlabs-stdlib ../stdlib && \
74+ # $(cd ../stdlib && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
75+ # RUN git clone --tags https://github.com/puppetlabs/puppetlabs-inifile ../inifile && \
76+ # $(cd ../inifile && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
77+ # RUN git clone --tags https://github.com/puppetlabs/puppetlabs-apt ../apt && \
78+ # $(cd ../apt && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
79+ # RUN git clone --tags https://github.com/puppetlabs/puppetlabs-facts ../facts && \
80+ # $(cd ../facts && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
7781
7882# Check that all dependencies are installed.
7983RUN /opt/puppetlabs/puppet/bin/puppet module --modulepath $module_path list --tree
Original file line number Diff line number Diff line change @@ -64,10 +64,14 @@ RUN /opt/puppetlabs/puppet/bin/puppet module install --modulepath $module_path -
6464
6565# Installing dependencies from source. These versions should be within the range
6666# of `dependencies` in metadata.json.
67- # RUN git clone https://github.com/puppetlabs/puppetlabs-stdlib ../stdlib --branch 9.7.0
68- # RUN git clone https://github.com/puppetlabs/puppetlabs-inifile ../inifile --branch 6.2.0
69- # RUN git clone https://github.com/puppetlabs/puppetlabs-apt ../apt --branch 10.0.1
70- # RUN git clone https://github.com/puppetlabs/puppetlabs-facts ../facts --branch 1.7.0
67+ # RUN git clone --tags https://github.com/puppetlabs/puppetlabs-stdlib ../stdlib && \
68+ # $(cd ../stdlib && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
69+ # RUN git clone --tags https://github.com/puppetlabs/puppetlabs-inifile ../inifile && \
70+ # $(cd ../inifile && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
71+ # RUN git clone --tags https://github.com/puppetlabs/puppetlabs-apt ../apt && \
72+ # $(cd ../apt && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
73+ # RUN git clone --tags https://github.com/puppetlabs/puppetlabs-facts ../facts && \
74+ # $(cd ../facts && git checkout $(git describe --tags $(git rev-list --tags --max-count=1)))
7175
7276# Check that all dependencies are installed.
7377RUN /opt/puppetlabs/puppet/bin/puppet module --modulepath $module_path list --tree
You can’t perform that action at this time.
0 commit comments