Skip to content
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.

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

Re-install git in development container and suppress download from golangci-lint #4113

Merged
merged 1 commit into from
Jul 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ run:
deadline: 30m
issues-exit-code: 1
tests: true
modules-download-mode: readonly
linters:
disable-all: true
enable:
Expand Down
13 changes: 13 additions & 0 deletions aio/develop/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,22 @@ RUN curl -sL https://deb.nodesource.com/setup_11.x | bash - \
gosu \
nano \
less \
unzip \
libssl-dev \
libghc-zlib-dev \
libcurl4-gnutls-dev \
libexpat1-dev \
gettext \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get clean

# Re-install git
# NOTE(shu-muto): husky-3.x requires git>=2.13.2 but golang:1.12 image based on debian 9 (stretch)
# does not satisfy the requirement. Its git version is 2.11.0.
# So re-install specified version of git from source code.
RUN GIT_VERSION=2.22.0 && apt-get remove -y git && cd /tmp && rm -fr git* && wget https://github.com/git/git/archive/v${GIT_VERSION}.zip -O git.zip && unzip git.zip && mv git-${GIT_VERSION} git && cd git && make prefix=/usr all && make prefix=/usr install
ENV GIT_EDITOR=nano

# Install dependencies. This will take a while.
RUN npm install -g npm@latest gulp@4.0.2 @angular/cli@8.0.3 ngx-i18nsupport

Expand Down