Skip to content

Commit cd951cf

Browse files
committed
updated ruby version and dependencies
1 parent 8b5d0a9 commit cd951cf

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
jobs:
33
test-building-container:
44
docker: # run the steps with Docker
5-
- image: circleci/ruby
5+
- image: circleci/ruby:2.6
66
# do stuff
77
steps:
88
# checkout sourcecode on to working_directory

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.3
1+
2.6.0

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN set -x \
1414
&& chmod -R 700 "${JIRA_HOME}" \
1515
&& chown -R daemon:daemon "${JIRA_HOME}" \
1616
&& mkdir -p "${JIRA_INSTALL}/conf/Catalina" \
17-
&& curl -Ls "https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-core-${JIRA_VERSION}.tar.gz" | tar -xz --directory "${JIRA_INSTALL}" --strip-components=1 --no-same-owner \
17+
&& curl -Ls "https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-core-${JIRA_VERSION}.tar.gz" | tar -xvz --directory "${JIRA_INSTALL}" --strip-components=1 --no-same-owner \
1818
&& curl -Ls "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.45.tar.gz" | tar -xz --directory "${JIRA_INSTALL}/lib" --strip-components=1 --no-same-owner "mysql-connector-java-5.1.45/mysql-connector-java-5.1.45-bin.jar" \
1919
&& rm -f "${JIRA_INSTALL}/lib/postgresql-9.1-903.jdbc4-atlassian-hosted.jar" \
2020
&& curl -Ls "https://jdbc.postgresql.org/download/postgresql-42.2.1.jar" -o "${JIRA_INSTALL}/lib/postgresql-42.2.1.jar" \

spec/support/helpers/docker_helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def kill_and_wait(options = {})
3131

3232
def wait_for_output(regex)
3333
thread = Thread.new do
34-
timeout(Docker::DSL.timeout) do
34+
Timeout.timeout(Docker::DSL.timeout) do
3535
Thread.handle_interrupt(TimeoutError => :on_blocking) do
3636
streaming_logs stdout: true, stderr: true, follow: true do |_, chunk|
3737
if chunk =~ regex

0 commit comments

Comments
 (0)