Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
105
Merge Requests
105
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
7d506640
Commit
7d506640
authored
Mar 09, 2021
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/repman: use jq component
instead of downloading a pre-binary that might not match the architecture
parent
6f95f28b
Pipeline
#14142
failed with stage
in 0 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
11 deletions
+4
-11
software/repman/buildout.hash.cfg
software/repman/buildout.hash.cfg
+1
-1
software/repman/instance.cfg.in
software/repman/instance.cfg.in
+1
-1
software/repman/software.cfg
software/repman/software.cfg
+2
-9
No files found.
software/repman/buildout.hash.cfg
View file @
7d506640
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
# not need these here).
# not need these here).
[instance.cfg]
[instance.cfg]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
fd0df2c4a91c1e478b72cbaeb6c021c3
md5sum =
8a08be95a04f1a47098c4fdef80bdfed
[instance-repman.cfg]
[instance-repman.cfg]
_update_hash_filename_ = instance-repman.cfg.jinja2.in
_update_hash_filename_ = instance-repman.cfg.jinja2.in
...
...
software/repman/instance.cfg.in
View file @
7d506640
...
@@ -46,7 +46,7 @@ context =
...
@@ -46,7 +46,7 @@ context =
# program binaries
# program binaries
raw bash_bin {{ bash_location }}/bin/bash
raw bash_bin {{ bash_location }}/bin/bash
raw jq_bin {{ jq_location }}/jq
raw jq_bin {{ jq_location }}/
bin/
jq
raw curl_bin {{ curl_location }}/bin/curl
raw curl_bin {{ curl_location }}/bin/curl
${:extra-context}
${:extra-context}
...
...
software/repman/software.cfg
View file @
7d506640
...
@@ -17,6 +17,7 @@ extends =
...
@@ -17,6 +17,7 @@ extends =
../../component/proxysql/buildout.cfg
../../component/proxysql/buildout.cfg
../../component/socat/buildout.cfg
../../component/socat/buildout.cfg
../../component/rsync/buildout.cfg
../../component/rsync/buildout.cfg
../../component/jq/buildout.cfg
../../stack/supervisord/buildout.cfg
../../stack/supervisord/buildout.cfg
../../stack/monitor/buildout.cfg
../../stack/monitor/buildout.cfg
../neoppod/software-common.cfg
../neoppod/software-common.cfg
...
@@ -50,7 +51,7 @@ context =
...
@@ -50,7 +51,7 @@ context =
key buildout_bin_directory buildout:bin-directory
key buildout_bin_directory buildout:bin-directory
key dbjobs_in dbjobs-in:target
key dbjobs_in dbjobs-in:target
key dash_location dash:location
key dash_location dash:location
key jq_location jq
-binary
:location
key jq_location jq:location
key logrotate_cfg template-logrotate-base:rendered
key logrotate_cfg template-logrotate-base:rendered
key gowork_bin gowork:bin
key gowork_bin gowork:bin
key gzip_location gzip:location
key gzip_location gzip:location
...
@@ -87,14 +88,6 @@ context =
...
@@ -87,14 +88,6 @@ context =
key proxysql_location proxysql:location
key proxysql_location proxysql:location
[jq-binary]
recipe = hexagonit.recipe.download
url = https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64
md5sum = 1fffde9f3c7944f063265e9a5e67ae4f
filename = jq
mode = 0755
download-only = true
[download-file]
[download-file]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:_update_hash_filename_}
url = ${:_profile_base_location_}/${:_update_hash_filename_}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment