diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..890902c --- /dev/null +++ b/.gitconfig @@ -0,0 +1,22 @@ +[color] + ui = true +[push] + default = simple +[pull] + default = simple + rebase = false +[merge] + tool = vimdiff + keepBackup = false +[rebase] + autosquash = true +[fetch] + prune = true +[filter "lfs"] + process = git-lfs filter-process + required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f +[user] + email = sutty@sutty.nl + name = Sutty diff --git a/Dockerfile b/Dockerfile index 00c8c9f..ee774e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -82,6 +82,7 @@ RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/reposit RUN apk add --no-cache libxslt libxml2 tzdata ruby ruby-bundler ruby-json ruby-bigdecimal ruby-rake ruby-irb RUN apk add --no-cache postgresql-libs libssh2 file rsync git jpegoptim vips RUN apk add --no-cache ffmpeg imagemagick pandoc tectonic oxipng jemalloc +RUN apk add --no-cache git-lfs # Chequear que la versiĆ³n de ruby sea la correcta RUN test "2.7.1" = `ruby -e 'puts RUBY_VERSION'`