Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

DTT (Staging > Test) [robo-dtt] #36723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deploy-code-org merged 2 commits into from
Sep 11, 2020
Merged

DTT (Staging > Test) [robo-dtt] #36723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9290946
Upgrade CI image install script to 18.04
wjordan Sep 11, 2020
4f2b161
Merge pull request #36708 from code-dot-org/ci-18.04
wjordan Sep 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions 8 .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ steps:
- git fetch --depth 100 origin $DRONE_TARGET_BRANCH

- name: verify-pr
image: joshlory/code-dot-org:0.10
image: wjordan/code-dot-org:2020-09-10
pull: always
commands:
- |
Expand All @@ -43,7 +43,7 @@ steps:
filename: unit-tests-cache.tar

- name: unit-tests
image: joshlory/code-dot-org:0.10
image: wjordan/code-dot-org:2020-09-10
pull: always
volumes:
- name: rbenv
Expand Down Expand Up @@ -127,7 +127,7 @@ steps:
- git merge origin/$DRONE_TARGET_BRANCH

- name: verify-pr
image: joshlory/code-dot-org:0.10
image: wjordan/code-dot-org:2020-09-10
pull: always
commands:
- |
Expand All @@ -153,7 +153,7 @@ steps:
restore: true

- name: ui-tests
image: joshlory/code-dot-org:0.10
image: wjordan/code-dot-org:2020-09-10
volumes:
- name: rbenv
path: /home/circleci/.rbenv
Expand Down
27 changes: 16 additions & 11 deletions 27 docker/dockerfiles/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Based on Code.org CircleCI-dependencies Dockerfile in .circle directory
# Pushed to Docker Hub at wintercdo/code-dot-org:0.7
FROM ubuntu:14.04
# Pushed to Docker Hub at wjordan/code-dot-org:2020-09-10
FROM ubuntu:18.04

USER root

Expand All @@ -11,16 +11,17 @@ RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
RUN locale-gen C.UTF-8 || true
ENV LANG=C.UTF-8

# essential tools
RUN apt-get update && \
apt-get install -y curl apt-transport-https sudo

# add circleci user
RUN groupadd --gid 3434 circleci \
&& useradd --uid 3434 --gid circleci --shell /bin/bash --create-home circleci \
&& echo 'circleci ALL=NOPASSWD: ALL' >> /etc/sudoers.d/50-circleci

# essential tools
RUN apt-get update && \
apt-get install -y curl apt-transport-https

# add yarn
RUN apt-get install -y gnupg
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list

Expand Down Expand Up @@ -91,18 +92,21 @@ RUN curl -sSL -o /tmp/mysql-apt-config_0.8.12-1_all.deb https://dev.mysql.com/ge
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
mysql-server \
libmysqlclient-dev
RUN chown -R mysql:mysql /var/lib/mysql /var/run/mysqld \
RUN chown -R mysql:mysql /var/lib/mysql \
&& service mysql start \
&& echo "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '';" | mysql \
&& chown -R mysql:mysql /var/lib/mysql /var/run/mysqld \
&& service mysql stop

# install a couple more things from config.yml
RUN apt-get update && apt-get -y install parallel libmagickwand-dev imagemagick

RUN mv /usr/bin/parallel /usr/bin/gnu_parallel

RUN curl -sSL -o /tmp/pdftk-java_3.0.2-2_all.deb https://mirrors.kernel.org/ubuntu/pool/universe/p/pdftk-java/pdftk-java_3.0.2-2_all.deb \
&& DEBIAN_FRONTEND=noninteractive dpkg -i /tmp/pdftk-java_3.0.2-2_all.deb || apt-get -fy install \
&& rm -rf /tmp/pdftk-java_3.0.2-2_all.deb
RUN apt-get update
RUN apt-get install -y libicu-dev enscript moreutils pdftk libmysqlclient-dev libsqlite3-dev
RUN apt-get install -y libicu-dev enscript moreutils libmysqlclient-dev libsqlite3-dev
RUN wget https://github.com/htacg/tidy-html5/releases/download/5.4.0/tidy-5.4.0-64bit.deb \
&& dpkg -i tidy-5.4.0-64bit.deb \
&& rm tidy-5.4.0-64bit.deb
Expand All @@ -125,8 +129,8 @@ USER circleci
RUN mkdir -p "$(rbenv root)"/plugins
RUN git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build

RUN rbenv install 2.5.0
RUN eval "$(rbenv init -)" && rbenv global 2.5.0 && rbenv rehash && gem install bundler -v 1.17
RUN rbenv install 2.5.8
RUN eval "$(rbenv init -)" && rbenv global 2.5.8 && rbenv rehash && gem install bundler -v 1.17
# This bashrc file will be used whenever someone runs bash in interactive mode.
# This is mostly intended for the use case where you want to start a shell into a running container with
# docker exec -it <container_name> bash, which bypasses the entrypoint script.
Expand All @@ -138,6 +142,7 @@ RUN sudo apt-get install -y software-properties-common && sudo add-apt-repositor
RUN sudo apt-get install -y jq

# en_US.UTF-8 locale not available by default
RUN sudo apt-get install -y locales
RUN sudo locale-gen en_US.UTF-8

COPY entrypoint.sh /entrypoint.sh
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.