Skip to content

Commit

Permalink
Merge pull request #96 from thelamer/master
Browse files Browse the repository at this point in the history
Stop gap versioning until we have a reference point
  • Loading branch information
aptalca authored Apr 11, 2019
2 parents 06b7ffd + 65584bf commit 5913c66
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 10 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,7 @@ RUN \
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
echo "**** set version tag ****" && \
if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
NEXTCLOUD_RELEASE=$(curl -s https://download.nextcloud.com/server/installer/setup-nextcloud.php \
| awk -F \' '/NC_VERSION/{print $4;exit}'); \
NEXTCLOUD_RELEASE=$(echo 15.0.7); \
fi && \
echo ${NEXTCLOUD_RELEASE} > /version.txt && \
echo "**** cleanup ****" && \
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,7 @@ RUN \
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
echo "**** set version tag ****" && \
if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
NEXTCLOUD_RELEASE=$(curl -s https://download.nextcloud.com/server/installer/setup-nextcloud.php \
| awk -F \' '/NC_VERSION/{print $4;exit}'); \
NEXTCLOUD_RELEASE=$(echo 15.0.7); \
fi && \
echo ${NEXTCLOUD_RELEASE} > /version.txt && \
echo "**** cleanup ****" && \
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile.armhf
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,7 @@ RUN \
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \
echo "**** set version tag ****" && \
if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
NEXTCLOUD_RELEASE=$(curl -s https://download.nextcloud.com/server/installer/setup-nextcloud.php \
| awk -F \' '/NC_VERSION/{print $4;exit}'); \
NEXTCLOUD_RELEASE=$(echo 15.0.7); \
fi && \
echo ${NEXTCLOUD_RELEASE} > /version.txt && \
echo "**** cleanup ****" && \
Expand Down
3 changes: 1 addition & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ pipeline {
steps{
script{
env.EXT_RELEASE = sh(
script: ''' curl -s https://download.nextcloud.com/server/installer/setup-nextcloud.php | awk -F \\' '/NC_VERSION/{print $4;exit}'
''',
script: ''' echo 15.0.7 ''',
returnStdout: true).trim()
env.RELEASE_LINK = 'custom_command'
}
Expand Down
3 changes: 1 addition & 2 deletions jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
# jenkins variables
project_name: docker-nextcloud
external_type: na
custom_version_command: |
{% raw -%}curl -s https://download.nextcloud.com/server/installer/setup-nextcloud.php | awk -F \\' '/NC_VERSION/{print $4;exit}'{%- endraw %}
custom_version_command: 'echo 15.0.7'
release_type: stable
release_tag: latest
ls_branch: master
Expand Down

0 comments on commit 5913c66

Please sign in to comment.