The validation script from #10681 is too pedantic, and does not handle
well situations like:
```
cat <<EOF # or <<-EOF
Whether the leading whitespace is stripped out or not by bash
it should still be considered as valid.
EOF
```
This reverts commit 4e65c1c319afffc325853b88c9aef0c42ec83482.
Signed-off-by: Tibor Vass <tibor@docker.com>
| ... | ... |
@@ -113,7 +113,7 @@ It is the responsibility of the subsystem maintainers to process patches affecti |
| 113 | 113 |
manner. |
| 114 | 114 |
|
| 115 | 115 |
* If the change affects areas of the code which are not part of a subsystem, |
| 116 |
-or if subsystem maintainers are unable to reach a timely decision, it must be approved by |
|
| 116 |
+or if subsystem maintainers are unable to reach a timely decision, it must be approved by |
|
| 117 | 117 |
the core maintainers. |
| 118 | 118 |
|
| 119 | 119 |
* If the change affects the UI or public APIs, or if it represents a major change in architecture, |
| ... | ... |
@@ -200,11 +200,11 @@ for each. |
| 200 | 200 |
2-code-review = "requires more code changes" |
| 201 | 201 |
1-design-review = "raises design concerns" |
| 202 | 202 |
4-merge = "general case" |
| 203 |
- |
|
| 203 |
+ |
|
| 204 | 204 |
# Docs approval |
| 205 | 205 |
[Rules.review.docs-approval] |
| 206 | 206 |
# Changes and additions to docs must be reviewed and approved (LGTM'd) by a minimum of two docs sub-project maintainers. |
| 207 |
- # If the docs change originates with a docs maintainer, only one additional LGTM is required (since we assume a docs maintainer approves of their own PR). |
|
| 207 |
+ # If the docs change originates with a docs maintainer, only one additional LGTM is required (since we assume a docs maintainer approves of their own PR). |
|
| 208 | 208 |
|
| 209 | 209 |
# Merge |
| 210 | 210 |
[Rules.review.states.4-merge] |
| ... | ... |
@@ -268,7 +268,7 @@ made through a pull request. |
| 268 | 268 |
|
| 269 | 269 |
# The chief architect is responsible for the overall integrity of the technical architecture |
| 270 | 270 |
# across all subsystems, and the consistency of APIs and UI. |
| 271 |
- # |
|
| 271 |
+ # |
|
| 272 | 272 |
# Changes to UI, public APIs and overall architecture (for example a plugin system) must |
| 273 | 273 |
# be approved by the chief architect. |
| 274 | 274 |
"Chief Architect" = "shykes" |
| ... | ... |
@@ -314,7 +314,7 @@ made through a pull request. |
| 314 | 314 |
] |
| 315 | 315 |
|
| 316 | 316 |
# The chief maintainer is responsible for all aspects of quality for the project including |
| 317 |
- # code reviews, usability, stability, security, performance, etc. |
|
| 317 |
+ # code reviews, usability, stability, security, performance, etc. |
|
| 318 | 318 |
# The most important function of the chief maintainer is to lead by example. On the first |
| 319 | 319 |
# day of a new maintainer, the best advice should be "follow the C.M.'s example and you'll |
| 320 | 320 |
# be fine". |
| ... | ... |
@@ -359,9 +359,9 @@ made through a pull request. |
| 359 | 359 |
# has a dedicated group of maintainers, which are dedicated to that subsytem and responsible |
| 360 | 360 |
# for its quality. |
| 361 | 361 |
# This "cellular division" is the primary mechanism for scaling maintenance of the project as it grows. |
| 362 |
- # |
|
| 362 |
+ # |
|
| 363 | 363 |
# The maintainers of each subsytem are responsible for: |
| 364 |
- # |
|
| 364 |
+ # |
|
| 365 | 365 |
# 1. Exposing a clear road map for improving their subsystem. |
| 366 | 366 |
# 2. Deliver prompt feedback and decisions on pull requests affecting their subsystem. |
| 367 | 367 |
# 3. Be available to anyone with questions, bug reports, criticism etc. |
| ... | ... |
@@ -371,9 +371,9 @@ made through a pull request. |
| 371 | 371 |
# road map of the project. |
| 372 | 372 |
# |
| 373 | 373 |
# #### How to review patches to your subsystem |
| 374 |
- # |
|
| 374 |
+ # |
|
| 375 | 375 |
# Accepting pull requests: |
| 376 |
- # |
|
| 376 |
+ # |
|
| 377 | 377 |
# - If the pull request appears to be ready to merge, give it a `LGTM`, which |
| 378 | 378 |
# stands for "Looks Good To Me". |
| 379 | 379 |
# - If the pull request has some small problems that need to be changed, make |
| ... | ... |
@@ -384,9 +384,9 @@ made through a pull request. |
| 384 | 384 |
# - If the PR only needs a few changes before being merged, any MAINTAINER can |
| 385 | 385 |
# make a replacement PR that incorporates the existing commits and fixes the |
| 386 | 386 |
# problems before a fast track merge. |
| 387 |
- # |
|
| 387 |
+ # |
|
| 388 | 388 |
# Closing pull requests: |
| 389 |
- # |
|
| 389 |
+ # |
|
| 390 | 390 |
# - If a PR appears to be abandoned, after having attempted to contact the |
| 391 | 391 |
# original contributor, then a replacement PR may be made. Once the |
| 392 | 392 |
# replacement PR is made, any contributor may close the original one. |
| ... | ... |
@@ -584,12 +584,12 @@ made through a pull request. |
| 584 | 584 |
Name = "Solomon Hykes" |
| 585 | 585 |
Email = "solomon@docker.com" |
| 586 | 586 |
GitHub = "shykes" |
| 587 |
- |
|
| 587 |
+ |
|
| 588 | 588 |
[people.spf13] |
| 589 | 589 |
Name = "Steve Francia" |
| 590 | 590 |
Email = "steve.francia@gmail.com" |
| 591 | 591 |
GitHub = "spf13" |
| 592 |
- |
|
| 592 |
+ |
|
| 593 | 593 |
[people.sven] |
| 594 | 594 |
Name = "Sven Dowideit" |
| 595 | 595 |
Email = "SvenDowideit@home.org.au" |
| ... | ... |
@@ -77,7 +77,7 @@ test-docker-py: build |
| 77 | 77 |
$(DOCKER_RUN_DOCKER) hack/make.sh binary test-docker-py |
| 78 | 78 |
|
| 79 | 79 |
validate: build |
| 80 |
- $(DOCKER_RUN_DOCKER) hack/make.sh validate-gofmt validate-dco validate-toml validate-spaces |
|
| 80 |
+ $(DOCKER_RUN_DOCKER) hack/make.sh validate-gofmt validate-dco validate-toml |
|
| 81 | 81 |
|
| 82 | 82 |
shell: build |
| 83 | 83 |
$(DOCKER_RUN_DOCKER) bash |
| ... | ... |
@@ -10,9 +10,9 @@ The following is courtesy of our legal counsel: |
| 10 | 10 |
|
| 11 | 11 |
|
| 12 | 12 |
Use and transfer of Docker may be subject to certain restrictions by the |
| 13 |
-United States and other governments. |
|
| 13 |
+United States and other governments. |
|
| 14 | 14 |
It is your responsibility to ensure that your use and/or transfer does not |
| 15 |
-violate applicable laws. |
|
| 15 |
+violate applicable laws. |
|
| 16 | 16 |
|
| 17 | 17 |
For more information, please see http://www.bis.doc.gov |
| 18 | 18 |
|
| ... | ... |
@@ -22,7 +22,7 @@ |
| 22 | 22 |
# must have access to the socket for the completions to function correctly |
| 23 | 23 |
# |
| 24 | 24 |
# Note for developers: |
| 25 |
-# Please arrange options sorted alphabetically by long name with the short |
|
| 25 |
+# Please arrange options sorted alphabetically by long name with the short |
|
| 26 | 26 |
# options immediately following their corresponding long form. |
| 27 | 27 |
# This order should be applied to lists, alternatives and code blocks. |
| 28 | 28 |
|
| ... | ... |
@@ -257,8 +257,8 @@ _docker_build() {
|
| 257 | 257 |
;; |
| 258 | 258 |
--file|-f) |
| 259 | 259 |
_filedir |
| 260 |
- return |
|
| 261 |
- ;; |
|
| 260 |
+ return |
|
| 261 |
+ ;; |
|
| 262 | 262 |
esac |
| 263 | 263 |
|
| 264 | 264 |
case "$cur" in |
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
# AUTHOR: Jessica Frazelle <jess@docker.com> |
| 4 | 4 |
# COMMENTS: |
| 5 | 5 |
# This file describes how to build a gparted container with all |
| 6 |
-# dependencies installed. It uses native X11 unix socket. |
|
| 6 |
+# dependencies installed. It uses native X11 unix socket. |
|
| 7 | 7 |
# Tested on Debian Jessie |
| 8 | 8 |
# USAGE: |
| 9 | 9 |
# # Download gparted Dockerfile |
| ... | ... |
@@ -14,9 +14,9 @@ justTar= |
| 14 | 14 |
|
| 15 | 15 |
usage() {
|
| 16 | 16 |
echo >&2 |
| 17 |
- |
|
| 17 |
+ |
|
| 18 | 18 |
echo >&2 "usage: $0 [options] repo suite [mirror]" |
| 19 |
- |
|
| 19 |
+ |
|
| 20 | 20 |
echo >&2 |
| 21 | 21 |
echo >&2 'options: (not recommended)' |
| 22 | 22 |
echo >&2 " -p set an http_proxy for debootstrap" |
| ... | ... |
@@ -26,20 +26,20 @@ usage() {
|
| 26 | 26 |
echo >&2 " -s # skip version detection and tagging (ie, precise also tagged as 12.04)" |
| 27 | 27 |
echo >&2 " # note that this will also skip adding universe and/or security/updates to sources.list" |
| 28 | 28 |
echo >&2 " -t # just create a tarball, especially for dockerbrew (uses repo as tarball name)" |
| 29 |
- |
|
| 29 |
+ |
|
| 30 | 30 |
echo >&2 |
| 31 | 31 |
echo >&2 " ie: $0 username/debian squeeze" |
| 32 | 32 |
echo >&2 " $0 username/debian squeeze http://ftp.uk.debian.org/debian/" |
| 33 |
- |
|
| 33 |
+ |
|
| 34 | 34 |
echo >&2 |
| 35 | 35 |
echo >&2 " ie: $0 username/ubuntu precise" |
| 36 | 36 |
echo >&2 " $0 username/ubuntu precise http://mirrors.melbourne.co.uk/ubuntu/" |
| 37 |
- |
|
| 37 |
+ |
|
| 38 | 38 |
echo >&2 |
| 39 | 39 |
echo >&2 " ie: $0 -t precise.tar.bz2 precise" |
| 40 | 40 |
echo >&2 " $0 -t wheezy.tgz wheezy" |
| 41 | 41 |
echo >&2 " $0 -t wheezy-uk.tar.xz wheezy http://ftp.uk.debian.org/debian/" |
| 42 |
- |
|
| 42 |
+ |
|
| 43 | 43 |
echo >&2 |
| 44 | 44 |
} |
| 45 | 45 |
|
| ... | ... |
@@ -145,10 +145,10 @@ if [ -z "$strictDebootstrap" ]; then |
| 145 | 145 |
sudo chroot . dpkg-divert --local --rename --add /sbin/initctl |
| 146 | 146 |
sudo ln -sf /bin/true sbin/initctl |
| 147 | 147 |
# see https://github.com/docker/docker/issues/446#issuecomment-16953173 |
| 148 |
- |
|
| 148 |
+ |
|
| 149 | 149 |
# shrink the image, since apt makes us fat (wheezy: ~157.5MB vs ~120MB) |
| 150 | 150 |
sudo chroot . apt-get clean |
| 151 |
- |
|
| 151 |
+ |
|
| 152 | 152 |
if strings usr/bin/dpkg | grep -q unsafe-io; then |
| 153 | 153 |
# while we're at it, apt is unnecessarily slow inside containers |
| 154 | 154 |
# this forces dpkg not to call sync() after package extraction and speeds up install |
| ... | ... |
@@ -159,7 +159,7 @@ if [ -z "$strictDebootstrap" ]; then |
| 159 | 159 |
# (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=584254#82), |
| 160 | 160 |
# and ubuntu lucid/10.04 only has 1.15.5.6 |
| 161 | 161 |
fi |
| 162 |
- |
|
| 162 |
+ |
|
| 163 | 163 |
# we want to effectively run "apt-get clean" after every install to keep images small (see output of "apt-get clean -s" for context) |
| 164 | 164 |
{
|
| 165 | 165 |
aptGetClean='"rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true";' |
| ... | ... |
@@ -167,17 +167,17 @@ if [ -z "$strictDebootstrap" ]; then |
| 167 | 167 |
echo "APT::Update::Post-Invoke { ${aptGetClean} };"
|
| 168 | 168 |
echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' |
| 169 | 169 |
} | sudo tee etc/apt/apt.conf.d/no-cache > /dev/null |
| 170 |
- |
|
| 170 |
+ |
|
| 171 | 171 |
# and remove the translations, too |
| 172 | 172 |
echo 'Acquire::Languages "none";' | sudo tee etc/apt/apt.conf.d/no-languages > /dev/null |
| 173 |
- |
|
| 173 |
+ |
|
| 174 | 174 |
# helpful undo lines for each the above tweaks (for lack of a better home to keep track of them): |
| 175 | 175 |
# rm /usr/sbin/policy-rc.d |
| 176 | 176 |
# rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl |
| 177 | 177 |
# rm /etc/dpkg/dpkg.cfg.d/02apt-speedup |
| 178 | 178 |
# rm /etc/apt/apt.conf.d/no-cache |
| 179 | 179 |
# rm /etc/apt/apt.conf.d/no-languages |
| 180 |
- |
|
| 180 |
+ |
|
| 181 | 181 |
if [ -z "$skipDetection" ]; then |
| 182 | 182 |
# see also rudimentary platform detection in hack/install.sh |
| 183 | 183 |
lsbDist='' |
| ... | ... |
@@ -187,14 +187,14 @@ if [ -z "$strictDebootstrap" ]; then |
| 187 | 187 |
if [ -z "$lsbDist" ] && [ -r etc/debian_version ]; then |
| 188 | 188 |
lsbDist='Debian' |
| 189 | 189 |
fi |
| 190 |
- |
|
| 190 |
+ |
|
| 191 | 191 |
case "$lsbDist" in |
| 192 | 192 |
Debian) |
| 193 | 193 |
# add the updates and security repositories |
| 194 | 194 |
if [ "$suite" != "$debianUnstable" -a "$suite" != 'unstable' ]; then |
| 195 | 195 |
# ${suite}-updates only applies to non-unstable
|
| 196 | 196 |
sudo sed -i "p; s/ $suite main$/ ${suite}-updates main/" etc/apt/sources.list
|
| 197 |
- |
|
| 197 |
+ |
|
| 198 | 198 |
# same for security updates |
| 199 | 199 |
echo "deb http://security.debian.org/ $suite/updates main" | sudo tee -a etc/apt/sources.list > /dev/null |
| 200 | 200 |
fi |
| ... | ... |
@@ -220,7 +220,7 @@ if [ -z "$strictDebootstrap" ]; then |
| 220 | 220 |
;; |
| 221 | 221 |
esac |
| 222 | 222 |
fi |
| 223 |
- |
|
| 223 |
+ |
|
| 224 | 224 |
# make sure our packages lists are as up to date as we can get them |
| 225 | 225 |
sudo chroot . apt-get update |
| 226 | 226 |
sudo chroot . apt-get dist-upgrade -y |
| ... | ... |
@@ -229,23 +229,23 @@ fi |
| 229 | 229 |
if [ "$justTar" ]; then |
| 230 | 230 |
# create the tarball file so it has the right permissions (ie, not root) |
| 231 | 231 |
touch "$repo" |
| 232 |
- |
|
| 232 |
+ |
|
| 233 | 233 |
# fill the tarball |
| 234 | 234 |
sudo tar --numeric-owner -caf "$repo" . |
| 235 | 235 |
else |
| 236 | 236 |
# create the image (and tag $repo:$suite) |
| 237 | 237 |
sudo tar --numeric-owner -c . | $docker import - $repo:$suite |
| 238 |
- |
|
| 238 |
+ |
|
| 239 | 239 |
# test the image |
| 240 | 240 |
$docker run -i -t $repo:$suite echo success |
| 241 |
- |
|
| 241 |
+ |
|
| 242 | 242 |
if [ -z "$skipDetection" ]; then |
| 243 | 243 |
case "$lsbDist" in |
| 244 | 244 |
Debian) |
| 245 | 245 |
if [ "$suite" = "$debianStable" -o "$suite" = 'stable' ] && [ -r etc/debian_version ]; then |
| 246 | 246 |
# tag latest |
| 247 | 247 |
$docker tag $repo:$suite $repo:latest |
| 248 |
- |
|
| 248 |
+ |
|
| 249 | 249 |
if [ -r etc/debian_version ]; then |
| 250 | 250 |
# tag the specific debian release version (which is only reasonable to tag on debian stable) |
| 251 | 251 |
ver=$(cat etc/debian_version) |
| ... | ... |
@@ -29,41 +29,41 @@ function template() {
|
| 29 | 29 |
# this should always match the template from CONTRIBUTING.md |
| 30 | 30 |
cat <<- EOM |
| 31 | 31 |
Description of problem: |
| 32 |
- |
|
| 33 |
- |
|
| 32 |
+ |
|
| 33 |
+ |
|
| 34 | 34 |
\`docker version\`: |
| 35 | 35 |
`${DOCKER_COMMAND} -D version`
|
| 36 |
- |
|
| 37 |
- |
|
| 36 |
+ |
|
| 37 |
+ |
|
| 38 | 38 |
\`docker info\`: |
| 39 | 39 |
`${DOCKER_COMMAND} -D info`
|
| 40 |
- |
|
| 41 |
- |
|
| 40 |
+ |
|
| 41 |
+ |
|
| 42 | 42 |
\`uname -a\`: |
| 43 | 43 |
`uname -a` |
| 44 |
- |
|
| 45 |
- |
|
| 44 |
+ |
|
| 45 |
+ |
|
| 46 | 46 |
Environment details (AWS, VirtualBox, physical, etc.): |
| 47 |
- |
|
| 48 |
- |
|
| 47 |
+ |
|
| 48 |
+ |
|
| 49 | 49 |
How reproducible: |
| 50 |
- |
|
| 51 |
- |
|
| 50 |
+ |
|
| 51 |
+ |
|
| 52 | 52 |
Steps to Reproduce: |
| 53 | 53 |
1. |
| 54 | 54 |
2. |
| 55 | 55 |
3. |
| 56 |
- |
|
| 57 |
- |
|
| 56 |
+ |
|
| 57 |
+ |
|
| 58 | 58 |
Actual Results: |
| 59 |
- |
|
| 60 |
- |
|
| 59 |
+ |
|
| 60 |
+ |
|
| 61 | 61 |
Expected Results: |
| 62 |
- |
|
| 63 |
- |
|
| 62 |
+ |
|
| 63 |
+ |
|
| 64 | 64 |
Additional info: |
| 65 |
- |
|
| 66 |
- |
|
| 65 |
+ |
|
| 66 |
+ |
|
| 67 | 67 |
EOM |
| 68 | 68 |
} |
| 69 | 69 |
|
| ... | ... |
@@ -81,7 +81,7 @@ echo -ne "Do you use \`sudo\` to call docker? [y|N]: " |
| 81 | 81 |
read -r -n 1 use_sudo |
| 82 | 82 |
echo "" |
| 83 | 83 |
|
| 84 |
-if [ "x${use_sudo}" = "xy" -o "x${use_sudo}" = "xY" ]; then
|
|
| 84 |
+if [ "x${use_sudo}" = "xy" -o "x${use_sudo}" = "xY" ]; then
|
|
| 85 | 85 |
export DOCKER_COMMAND="sudo ${DOCKER}"
|
| 86 | 86 |
fi |
| 87 | 87 |
|
| ... | ... |
@@ -6,7 +6,7 @@ FROM ubuntu |
| 6 | 6 |
MAINTAINER SvenDowideit@docker.com |
| 7 | 7 |
|
| 8 | 8 |
# Add the PostgreSQL PGP key to verify their Debian packages. |
| 9 |
-# It should be the same key as https://www.postgresql.org/media/keys/ACCC4CF8.asc |
|
| 9 |
+# It should be the same key as https://www.postgresql.org/media/keys/ACCC4CF8.asc |
|
| 10 | 10 |
RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 |
| 11 | 11 |
|
| 12 | 12 |
# Add PostgreSQL's repository. It contains the most recent stable release |
| ... | ... |
@@ -33,7 +33,7 @@ RUN /etc/init.d/postgresql start &&\ |
| 33 | 33 |
createdb -O docker docker |
| 34 | 34 |
|
| 35 | 35 |
# Adjust PostgreSQL configuration so that remote connections to the |
| 36 |
-# database are possible. |
|
| 36 |
+# database are possible. |
|
| 37 | 37 |
RUN echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/9.3/main/pg_hba.conf |
| 38 | 38 |
|
| 39 | 39 |
# And add ``listen_addresses`` to ``/etc/postgresql/9.3/main/postgresql.conf`` |
| ... | ... |
@@ -3,23 +3,23 @@ |
| 3 | 3 |
if [ -z "$VALIDATE_UPSTREAM" ]; then |
| 4 | 4 |
# this is kind of an expensive check, so let's not do this twice if we |
| 5 | 5 |
# are running more than one validate bundlescript |
| 6 |
- |
|
| 6 |
+ |
|
| 7 | 7 |
VALIDATE_REPO='https://github.com/docker/docker.git' |
| 8 | 8 |
VALIDATE_BRANCH='master' |
| 9 |
- |
|
| 9 |
+ |
|
| 10 | 10 |
if [ "$TRAVIS" = 'true' -a "$TRAVIS_PULL_REQUEST" != 'false' ]; then |
| 11 | 11 |
VALIDATE_REPO="https://github.com/${TRAVIS_REPO_SLUG}.git"
|
| 12 | 12 |
VALIDATE_BRANCH="${TRAVIS_BRANCH}"
|
| 13 | 13 |
fi |
| 14 |
- |
|
| 14 |
+ |
|
| 15 | 15 |
VALIDATE_HEAD="$(git rev-parse --verify HEAD)" |
| 16 |
- |
|
| 16 |
+ |
|
| 17 | 17 |
git fetch -q "$VALIDATE_REPO" "refs/heads/$VALIDATE_BRANCH" |
| 18 | 18 |
VALIDATE_UPSTREAM="$(git rev-parse --verify FETCH_HEAD)" |
| 19 |
- |
|
| 19 |
+ |
|
| 20 | 20 |
VALIDATE_COMMIT_LOG="$VALIDATE_UPSTREAM..$VALIDATE_HEAD" |
| 21 | 21 |
VALIDATE_COMMIT_DIFF="$VALIDATE_UPSTREAM...$VALIDATE_HEAD" |
| 22 |
- |
|
| 22 |
+ |
|
| 23 | 23 |
validate_diff() {
|
| 24 | 24 |
if [ "$VALIDATE_UPSTREAM" != "$VALIDATE_HEAD" ]; then |
| 25 | 25 |
git diff "$VALIDATE_COMMIT_DIFF" "$@" |
| ... | ... |
@@ -18,17 +18,17 @@ for d in "$CROSS/"*/*; do |
| 18 | 18 |
BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION" |
| 19 | 19 |
mkdir -p "$DEST/$GOOS/$GOARCH" |
| 20 | 20 |
TGZ="$DEST/$GOOS/$GOARCH/$BINARY_NAME.tgz" |
| 21 |
- |
|
| 21 |
+ |
|
| 22 | 22 |
mkdir -p "$DEST/build" |
| 23 |
- |
|
| 23 |
+ |
|
| 24 | 24 |
mkdir -p "$DEST/build/usr/local/bin" |
| 25 | 25 |
cp -L "$d/$BINARY_FULLNAME" "$DEST/build/usr/local/bin/docker$BINARY_EXTENSION" |
| 26 |
- |
|
| 26 |
+ |
|
| 27 | 27 |
tar --numeric-owner --owner 0 -C "$DEST/build" -czf "$TGZ" usr |
| 28 |
- |
|
| 28 |
+ |
|
| 29 | 29 |
hash_files "$TGZ" |
| 30 |
- |
|
| 30 |
+ |
|
| 31 | 31 |
rm -rf "$DEST/build" |
| 32 |
- |
|
| 32 |
+ |
|
| 33 | 33 |
echo "Created tgz: $TGZ" |
| 34 | 34 |
done |
| 35 | 35 |
deleted file mode 100644 |
| ... | ... |
@@ -1,33 +0,0 @@ |
| 1 |
-#!/bin/bash |
|
| 2 |
- |
|
| 3 |
-source "$(dirname "$BASH_SOURCE")/.validate" |
|
| 4 |
- |
|
| 5 |
-#Ignoring files from vendor/, builder/parser/testfiles*, docs/theme/mkdocs/tipuesearch*, ending with .md and .go |
|
| 6 |
-ignoreFiles='^builder/parser/testfiles*|^docs/theme/mkdocs/tipuesearch*|^vendor/|\.md$|\.go$' |
|
| 7 |
- |
|
| 8 |
-IFS=$'\n' |
|
| 9 |
-files=( $(validate_diff --diff-filter=ACMR --name-only | grep -v "$ignoreFiles" || true) ) |
|
| 10 |
-unset IFS |
|
| 11 |
- |
|
| 12 |
-badFiles=() |
|
| 13 |
-for f in "${files[@]}"; do
|
|
| 14 |
- if [ "$(git show "$VALIDATE_HEAD:$f" | grep '[[:space:]]$')" ]; then |
|
| 15 |
- badFiles+=( "$f" ) |
|
| 16 |
- fi |
|
| 17 |
-done |
|
| 18 |
- |
|
| 19 |
-if [ ${#badFiles[@]} -eq 0 ]; then
|
|
| 20 |
- echo 'Congratulations! All text files are properly formatted.' |
|
| 21 |
-else |
|
| 22 |
- {
|
|
| 23 |
- echo "These files have trailing whitespaces:" |
|
| 24 |
- for f in "${badFiles[@]}"; do
|
|
| 25 |
- echo " - $f" |
|
| 26 |
- done |
|
| 27 |
- echo |
|
| 28 |
- echo 'Please reformat the above files using, for example:' |
|
| 29 |
- echo '"ex -sc "'"%s/[[:space:]]*$//g|x"'" file" and commit the result.' |
|
| 30 |
- echo |
|
| 31 |
- } >&2 |
|
| 32 |
- false |
|
| 33 |
-fi |
| ... | ... |
@@ -11,17 +11,17 @@ clone() {
|
| 11 | 11 |
vcs=$1 |
| 12 | 12 |
pkg=$2 |
| 13 | 13 |
rev=$3 |
| 14 |
- |
|
| 14 |
+ |
|
| 15 | 15 |
pkg_url=https://$pkg |
| 16 | 16 |
target_dir=src/$pkg |
| 17 |
- |
|
| 17 |
+ |
|
| 18 | 18 |
echo -n "$pkg @ $rev: " |
| 19 |
- |
|
| 19 |
+ |
|
| 20 | 20 |
if [ -d $target_dir ]; then |
| 21 | 21 |
echo -n 'rm old, ' |
| 22 | 22 |
rm -fr $target_dir |
| 23 | 23 |
fi |
| 24 |
- |
|
| 24 |
+ |
|
| 25 | 25 |
echo -n 'clone, ' |
| 26 | 26 |
case $vcs in |
| 27 | 27 |
git) |
| ... | ... |
@@ -32,10 +32,10 @@ clone() {
|
| 32 | 32 |
hg clone --quiet --updaterev $rev $pkg_url $target_dir |
| 33 | 33 |
;; |
| 34 | 34 |
esac |
| 35 |
- |
|
| 35 |
+ |
|
| 36 | 36 |
echo -n 'rm VCS, ' |
| 37 | 37 |
( cd $target_dir && rm -rf .{git,hg} )
|
| 38 |
- |
|
| 38 |
+ |
|
| 39 | 39 |
echo done |
| 40 | 40 |
} |
| 41 | 41 |
|
| ... | ... |
@@ -23,20 +23,20 @@ Certificate: |
| 23 | 23 |
7e:4e:78:7d:0a:9e:8f:42:43 |
| 24 | 24 |
Exponent: 65537 (0x10001) |
| 25 | 25 |
X509v3 extensions: |
| 26 |
- X509v3 Basic Constraints: |
|
| 26 |
+ X509v3 Basic Constraints: |
|
| 27 | 27 |
CA:FALSE |
| 28 |
- Netscape Comment: |
|
| 28 |
+ Netscape Comment: |
|
| 29 | 29 |
Easy-RSA Generated Certificate |
| 30 |
- X509v3 Subject Key Identifier: |
|
| 30 |
+ X509v3 Subject Key Identifier: |
|
| 31 | 31 |
DE:42:EF:2D:98:A3:6C:A8:AA:E0:8C:71:2C:9D:64:23:A9:E2:7E:81 |
| 32 |
- X509v3 Authority Key Identifier: |
|
| 32 |
+ X509v3 Authority Key Identifier: |
|
| 33 | 33 |
keyid:66:EE:C3:17:3D:3D:AB:44:01:6B:6F:B2:99:19:BD:AA:02:B5:34:FB |
| 34 | 34 |
DirName:/C=US/ST=CA/L=SanFrancisco/O=Fort-Funston/OU=changeme/CN=changeme/name=changeme/emailAddress=mail@host.domain |
| 35 | 35 |
serial:FD:AB:EC:6A:84:27:04:A7 |
| 36 | 36 |
|
| 37 |
- X509v3 Extended Key Usage: |
|
| 37 |
+ X509v3 Extended Key Usage: |
|
| 38 | 38 |
TLS Web Client Authentication |
| 39 |
- X509v3 Key Usage: |
|
| 39 |
+ X509v3 Key Usage: |
|
| 40 | 40 |
Digital Signature |
| 41 | 41 |
Signature Algorithm: sha1WithRSAEncryption |
| 42 | 42 |
1c:44:26:ea:e1:66:25:cb:e4:8e:57:1c:f6:b9:17:22:62:40: |
| ... | ... |
@@ -23,20 +23,20 @@ Certificate: |
| 23 | 23 |
1d:7b:6c:7b:be:89:6b:88:8b |
| 24 | 24 |
Exponent: 65537 (0x10001) |
| 25 | 25 |
X509v3 extensions: |
| 26 |
- X509v3 Basic Constraints: |
|
| 26 |
+ X509v3 Basic Constraints: |
|
| 27 | 27 |
CA:FALSE |
| 28 |
- Netscape Comment: |
|
| 28 |
+ Netscape Comment: |
|
| 29 | 29 |
Easy-RSA Generated Certificate |
| 30 |
- X509v3 Subject Key Identifier: |
|
| 30 |
+ X509v3 Subject Key Identifier: |
|
| 31 | 31 |
9E:F8:49:D0:A2:76:30:5C:AB:2B:8A:B5:8D:C6:45:1F:A7:F8:CF:85 |
| 32 |
- X509v3 Authority Key Identifier: |
|
| 32 |
+ X509v3 Authority Key Identifier: |
|
| 33 | 33 |
keyid:DC:A5:F1:76:DB:4E:CD:8E:EF:B1:23:56:1D:92:80:99:74:3B:EA:6F |
| 34 | 34 |
DirName:/C=US/ST=CA/L=SanFrancisco/O=Evil Inc/OU=changeme/CN=changeme/name=changeme/emailAddress=mail@host.domain |
| 35 | 35 |
serial:E7:21:1E:18:41:1B:96:83 |
| 36 | 36 |
|
| 37 |
- X509v3 Extended Key Usage: |
|
| 37 |
+ X509v3 Extended Key Usage: |
|
| 38 | 38 |
TLS Web Client Authentication |
| 39 |
- X509v3 Key Usage: |
|
| 39 |
+ X509v3 Key Usage: |
|
| 40 | 40 |
Digital Signature |
| 41 | 41 |
Signature Algorithm: sha1WithRSAEncryption |
| 42 | 42 |
48:76:c0:18:fa:0a:ee:4e:1a:ec:02:9d:d4:83:ca:94:54:a1: |
| ... | ... |
@@ -23,22 +23,22 @@ Certificate: |
| 23 | 23 |
a8:05:32:1e:f9:95:09:14:75 |
| 24 | 24 |
Exponent: 65537 (0x10001) |
| 25 | 25 |
X509v3 extensions: |
| 26 |
- X509v3 Basic Constraints: |
|
| 26 |
+ X509v3 Basic Constraints: |
|
| 27 | 27 |
CA:FALSE |
| 28 |
- Netscape Cert Type: |
|
| 28 |
+ Netscape Cert Type: |
|
| 29 | 29 |
SSL Server |
| 30 |
- Netscape Comment: |
|
| 30 |
+ Netscape Comment: |
|
| 31 | 31 |
Easy-RSA Generated Server Certificate |
| 32 |
- X509v3 Subject Key Identifier: |
|
| 32 |
+ X509v3 Subject Key Identifier: |
|
| 33 | 33 |
14:02:FD:FD:DD:13:38:E0:71:EA:D1:BE:C0:0E:89:1A:2D:B6:19:06 |
| 34 |
- X509v3 Authority Key Identifier: |
|
| 34 |
+ X509v3 Authority Key Identifier: |
|
| 35 | 35 |
keyid:66:EE:C3:17:3D:3D:AB:44:01:6B:6F:B2:99:19:BD:AA:02:B5:34:FB |
| 36 | 36 |
DirName:/C=US/ST=CA/L=SanFrancisco/O=Fort-Funston/OU=changeme/CN=changeme/name=changeme/emailAddress=mail@host.domain |
| 37 | 37 |
serial:FD:AB:EC:6A:84:27:04:A7 |
| 38 | 38 |
|
| 39 |
- X509v3 Extended Key Usage: |
|
| 39 |
+ X509v3 Extended Key Usage: |
|
| 40 | 40 |
TLS Web Server Authentication |
| 41 |
- X509v3 Key Usage: |
|
| 41 |
+ X509v3 Key Usage: |
|
| 42 | 42 |
Digital Signature, Key Encipherment |
| 43 | 43 |
Signature Algorithm: sha1WithRSAEncryption |
| 44 | 44 |
40:0f:10:39:c4:b7:0f:0d:2f:bf:d2:16:cc:8e:d3:9a:fb:8b: |
| ... | ... |
@@ -23,22 +23,22 @@ Certificate: |
| 23 | 23 |
9e:02:5c:be:65:98:a4:b4:b5 |
| 24 | 24 |
Exponent: 65537 (0x10001) |
| 25 | 25 |
X509v3 extensions: |
| 26 |
- X509v3 Basic Constraints: |
|
| 26 |
+ X509v3 Basic Constraints: |
|
| 27 | 27 |
CA:FALSE |
| 28 |
- Netscape Cert Type: |
|
| 28 |
+ Netscape Cert Type: |
|
| 29 | 29 |
SSL Server |
| 30 |
- Netscape Comment: |
|
| 30 |
+ Netscape Comment: |
|
| 31 | 31 |
Easy-RSA Generated Server Certificate |
| 32 |
- X509v3 Subject Key Identifier: |
|
| 32 |
+ X509v3 Subject Key Identifier: |
|
| 33 | 33 |
1F:E0:57:CA:CB:76:C9:C4:86:B9:EA:69:17:C0:F3:51:CE:95:40:EC |
| 34 |
- X509v3 Authority Key Identifier: |
|
| 34 |
+ X509v3 Authority Key Identifier: |
|
| 35 | 35 |
keyid:DC:A5:F1:76:DB:4E:CD:8E:EF:B1:23:56:1D:92:80:99:74:3B:EA:6F |
| 36 | 36 |
DirName:/C=US/ST=CA/L=SanFrancisco/O=Evil Inc/OU=changeme/CN=changeme/name=changeme/emailAddress=mail@host.domain |
| 37 | 37 |
serial:E7:21:1E:18:41:1B:96:83 |
| 38 | 38 |
|
| 39 |
- X509v3 Extended Key Usage: |
|
| 39 |
+ X509v3 Extended Key Usage: |
|
| 40 | 40 |
TLS Web Server Authentication |
| 41 |
- X509v3 Key Usage: |
|
| 41 |
+ X509v3 Key Usage: |
|
| 42 | 42 |
Digital Signature, Key Encipherment |
| 43 | 43 |
Signature Algorithm: sha1WithRSAEncryption |
| 44 | 44 |
04:93:0e:28:01:94:18:f0:8c:7c:d3:0c:ad:e9:b7:46:b1:30: |