Commit Graph

323 Commits

Author SHA1 Message Date
Stephen Marshall
ab01d124a9 Merge pull request #102 from arthurbarr/master
Merge dev branch
2018-05-31 16:24:28 +01:00
Arthur Barr
be9c759a1c Merge build-devserver target conflict 2018-05-31 15:23:06 +01:00
Arthur Barr
70f45d58bf Fixes #84
* Change apt URL for non-x86_64 platforms

* Convert statfs.Type for s390x

* Includes more links to docs

* Remove extra words
2018-05-31 15:11:42 +01:00
Rob Parker
143649deb6 More metric tests and fix reconnect
* more metric test and fix reconnect

* remove build-devjmstest as dependency
2018-05-31 11:56:39 +01:00
Arthur Barr
0b36edae58 Convert statfs.Type for s390x (#98)
* Change apt URL for non-x86_64 platforms

* Convert statfs.Type for s390x
2018-05-31 11:55:32 +01:00
Arthur Barr
45e970e18a Change apt URL for non-x86_64 platforms (#97) 2018-05-31 10:52:54 +01:00
Arthur Barr
9f3032f014 Log extra environment information (#95)
* Make metrics tests use a host port

* fix port forwarding in devconfig tests

* Log extra environment information at startup
2018-05-31 09:35:16 +01:00
Rob Parker
54f0ae65a6 Add MQIPT Sample (#93) 2018-05-30 16:24:03 +01:00
Arthur Barr
6996f2b9b3 Make metrics tests use a host port (#94)
* Make metrics tests use a host port

* fix port forwarding in devconfig tests
2018-05-30 15:38:19 +01:00
Stephen Marshall
987b629a27 Merge pull request #92 from parrobe/issue91
Fix lint failures in mqmetric tests
2018-05-29 11:39:19 +01:00
Rob Parker
00a0b1574b Fix lint failures in mqmetric tests 2018-05-29 09:14:04 +01:00
Rob Parker
531f2710c7 Add Docker FV tests for metric gathering (#90)
* initial metric tests

* Add FV tests for metrics

* correct comment in test
2018-05-25 13:09:48 +01:00
Rob Parker
1ce796a9e2 Merge pull request #83 from sdmarshall79/master
master - Security upgrade for libprocps4 and procps
2018-05-25 09:54:18 +01:00
Rob Parker
91e20f0f98 Merge pull request #82 from sdmarshall79/unit-tests
Unit tests
2018-05-25 09:21:19 +01:00
Stephen Marshall
6f079ca0bb Security upgrade for libprocps4 and procps 2018-05-25 09:10:17 +01:00
Stephen Marshall
7f78ba89bf Security upgrade for libprocps4 and procps 2018-05-25 08:54:20 +01:00
Stephen Marshall
4bbdb36da0 Skip metrics collect on first pass and more unit tests 2018-05-24 17:10:16 +01:00
Stephen Marshall
a4b9a9abaf Initial delivery of metrics code (#81)
* Initial delivery of metrics code

* Fix build issues

* Fix build issue with go vet
2018-05-24 09:15:12 +01:00
Stephen Marshall
e251839639 Merge pull request #80 from parrobe/dev
Check err when calling ImageInspectWithRaw
2018-05-17 12:13:27 +01:00
Rob Parker
9b595a0e01 Check err when calling ImageInspectWithRaw 2018-05-16 13:41:18 +01:00
Rob Parker
6493e82fa6 Merge branch 'dev' of github.com:parrobe/mq-container into dev 2018-05-16 13:36:27 +01:00
Rob Parker
3127abd5ad correctly configure the GO environment (#78) 2018-05-16 10:09:24 +01:00
Rob Parker
adad573f99 correctly configure the GO environment 2018-05-16 09:45:43 +01:00
Rob Parker
5d3519d9bb Merge pull request #77 from arthurbarr/dev
Add MQ and Go SDK images
2018-05-15 11:47:39 +02:00
Arthur Barr
36a24d8864 Merge branch 'master' of https://github.com/ibm-messaging/mq-container into dev 2018-05-15 09:38:57 +01:00
Arthur Barr
e18dcbd8e8 Add MQ and Go SDK images 2018-05-15 09:38:50 +01:00
Rob Parker
5da57489e2 Merge pull request #75 from sdmarshall79/config-webserver-error
Surface errors from configuring the webserver
2018-05-10 11:22:57 +02:00
Stephen Marshall
c389886d3c Surface errors from configuring the webserver 2018-05-04 10:58:12 +01:00
Rob Parker
6775264bcc Merge pull request #73 from parrobe/tlsfixes
Tlsfixes
2018-04-30 17:18:27 +02:00
Arthur Barr
77c0cfa221 Merge branch 'master' into tlsfixes 2018-04-30 16:00:11 +01:00
Rob Parker
04bb404eee Fix TLS logic so containers can be started multiple times 2018-04-30 15:57:19 +01:00
Rob Parker
d8b6b78d66 Fix license to include copyright - master (#66)
* Fix license to include copyright

* Fix copyright line
2018-04-30 15:54:15 +01:00
Rob Parker
8eb937b8e0 ensure we use '' round blank for SSLCIPH 2018-04-30 10:36:55 +01:00
Rob Parker
f051325deb Merge pull request #65 from sdmarshall79/issue64
This will replace hard-coded values with calls to LookupMQM
2018-04-26 10:14:42 +02:00
Stephen Marshall
3aa46e0793 When pushed, this commit will replace hard-coded values with calls to LookupMQM 2018-04-25 16:24:46 +01:00
Rob Parker
bf36f8bb2c Merge pull request #59 from riccardobiraghi/test-coverage
Fix test coverage in docker containers
2018-04-25 17:21:06 +02:00
Riccardo Biraghi
2be0501904 Merge branch 'test-coverage' of https://github.com/riccardobiraghi/mq-container into test-coverage 2018-04-24 16:32:33 +01:00
Riccardo Biraghi
6895097d36 Remove unused import 2018-04-24 16:31:21 +01:00
Riccardo Biraghi
d7633d8313 Fix test coverage in docker containers 2018-04-24 16:31:21 +01:00
Rob Parker
818cbaca8d Merge pull request #60 from riccardobiraghi/travis
Ensure compatibility with Docker 1.12
2018-04-24 17:24:39 +02:00
Riccardo Biraghi
60d098d86d Correct images tar archive name 2018-04-23 17:43:17 +01:00
Riccardo Biraghi
0075b5b727 Delete useless file 2018-04-23 17:29:02 +01:00
Riccardo Biraghi
13981cef86 Set DOCKER_API_VERSION in DOCKER_DOWNGRADE 2018-04-23 17:27:19 +01:00
Riccardo Biraghi
363c8487df Set DOCKER_API_VERSION in travis 2018-04-23 16:37:03 +01:00
Riccardo Biraghi
9d46e6e25a Fix makefile 2018-04-23 15:41:31 +01:00
Riccardo Biraghi
4826e83c9e Use ?= for NUM_CPU 2018-04-23 15:27:22 +01:00
Riccardo Biraghi
1cba663922 Minor corrections 2018-04-23 15:07:36 +01:00
Riccardo Biraghi
c9e7ae194e Fix quotes escape in .travis.yml 2018-04-23 12:50:11 +01:00
Riccardo Biraghi
d61cc9c686 Add quotes to env command 2018-04-23 12:34:11 +01:00
Riccardo Biraghi
20a2b3f593 Test on docker 1.12 with Travis 2018-04-23 12:01:54 +01:00