Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
ae73801
Build assets file on travis
asbiin Jan 27, 2018
0a8fd72
Not sure if mix-manifest should be in source control
asbiin Jan 27, 2018
701cd09
Fix jquery-tags-input name import
asbiin Jan 27, 2018
36f58bb
Merge remote-tracking branch 'origin/bug/750-jquery-tags-input' into …
asbiin Jan 27, 2018
a645ebf
Try deploy with bintray
asbiin Jan 27, 2018
44cdf04
Fix json
asbiin Jan 27, 2018
6d27695
Change build order
asbiin Jan 28, 2018
e0ce684
Delete octicons build
asbiin Jan 28, 2018
62bb4b1
Add gitignore
asbiin Jan 28, 2018
473d206
Reduce verbosity
asbiin Jan 28, 2018
8d1d16e
Reduce verbosity
asbiin Jan 28, 2018
7da4e6f
Add infos to deploy, reduce verbosity again
asbiin Jan 28, 2018
600f08f
One missing coma
asbiin Jan 28, 2018
54b5247
Fix sed
asbiin Jan 28, 2018
0701c06
Fix version detection
asbiin Jan 28, 2018
1674f9d
Change file format
asbiin Jan 28, 2018
ed702fc
Add list of files to ignore
asbiin Jan 28, 2018
e8004ce
Try to build and publish docker file
asbiin Jan 29, 2018
03e361d
Fix docker image creation
asbiin Jan 29, 2018
fdd3dab
Add set v
asbiin Jan 29, 2018
5e6752b
Using build stages
asbiin Jan 29, 2018
9af36c2
Ignore some files for docker image
asbiin Jan 29, 2018
19cf56e
Remove nodejs and composer as assets are already included
asbiin Jan 29, 2018
814152e
Remove stages
asbiin Jan 29, 2018
f209d63
Add 1 file
asbiin Jan 29, 2018
7c254f6
Remove tests from build archive
asbiin Jan 29, 2018
91bcd68
Remove fonts
asbiin Jan 29, 2018
c9e1059
Merge remote-tracking branch 'origin/master' into features/800-remove…
asbiin Jan 29, 2018
e41d53f
Remove these new assets
asbiin Jan 29, 2018
ef60dec
Merge branch 'master' into features/800-remove-assets
asbiin Jan 30, 2018
80e1bdb
Remove condition to test the PR
asbiin Jan 30, 2018
ba5dc25
Merge branch 'features/800-remove-assets' of github.com:monicahq/moni…
asbiin Jan 30, 2018
4accc73
Reverse last commit
asbiin Jan 30, 2018
e0ef6c9
Change build order to avoid builddir in docker image
asbiin Jan 30, 2018
9e3baad
Split make build commands to make logs more clear
asbiin Jan 31, 2018
4fc1fe6
Merge remote-tracking branch 'origin/master' into features/800-remove…
asbiin Jan 31, 2018
ffe1c11
Add some docs
asbiin Jan 31, 2018
9f14029
Move build command to build-dev
asbiin Jan 31, 2018
0f913cc
Add some informations to bintray deploi
asbiin Feb 2, 2018
f286161
Try to use publiux/laravelcdn
asbiin Feb 4, 2018
a20c404
Miss one file
asbiin Feb 4, 2018
f829065
Merge from master
asbiin Feb 5, 2018
c475b7a
Build and deploy assets for git tag only
asbiin Feb 5, 2018
e8ceddd
Remove publiux/laravelcdn
asbiin Feb 5, 2018
5989119
Fix before_install condition
asbiin Feb 5, 2018
6ccd691
Merge branch 'master' into features/800-remove-assets
asbiin Feb 7, 2018
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
43 changes: 33 additions & 10 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,37 @@
node_modules/
persist/
public/storage/
resources/vendor/
vendor/
.dockerignore
.env
.git/
.gitattributes
.github/
.gitignore
**/.gitignore
**/.gitkeep
.ci/
.env
CODE_OF_CONDUCT.md
CONTRIBUTING.md
docker-compose.yml
Dockerfile
.dockerignore
docs/
Homestead.json
Homestead.yaml
docker-compose.yml
monica.sublime-workspace
readme.md
node_modules/
npm-debug.log*
persist/
phpunit.xml
Procfile
public/storage/
resources/vendor/
results/
.sass-lint.yml
server.php
sonar-project.properties
steward.yml
.styleci.yml
tests/
.travis.deploy.json.in
.travis.deploy.json
travis-sonar.sh
travis-sonar.sh.sig
.travis.yml
.travis.yml.sig
yarn.lock
12 changes: 1 addition & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM alpine:3.6

EXPOSE 80:80

RUN apk update && apk add apache2 curl git make netcat-openbsd nodejs-current-npm openssl php7 php7-apache2 php7-ctype php7-dom php7-fileinfo php7-gd php7-iconv php7-intl php7-json php7-mbstring php7-mysqli php7-openssl php7-pdo_mysql php7-phar php7-session php7-simplexml php7-tokenizer php7-xml php7-xmlreader php7-xmlwriter php7-zip php7-zlib php7-pgsql php7-pdo_pgsql php7-curl
RUN apk update && apk add apache2 curl git make netcat-openbsd openssl php7 php7-apache2 php7-ctype php7-dom php7-fileinfo php7-gd php7-iconv php7-intl php7-json php7-mbstring php7-mysqli php7-openssl php7-pdo_mysql php7-phar php7-session php7-simplexml php7-tokenizer php7-xml php7-xmlreader php7-xmlwriter php7-zip php7-zlib php7-pgsql php7-pdo_pgsql php7-curl

RUN mkdir -p /run/apache2

Expand All @@ -11,13 +11,6 @@ RUN mkdir -p /run/apache2
RUN adduser -D monica && addgroup apache monica
WORKDIR /var/www/monica

# As an optimization, install Node stuff early in the process so that
# it gets cached. That way we don't have to rerun all of this every
# time we change a config file or edit some CSS. Yes, this is ugly,
# but it shaves a few minutes off repeated build times.
ADD package.json .
RUN chown -R monica . && su monica -c "npm install"

# Copy the local (outside Docker) source into the working directory,
# copy system files into their proper homes, and set file ownership
# correctly
Expand All @@ -28,9 +21,6 @@ RUN cp docker/000-default.conf /etc/apache2/conf.d \
&& chgrp -R apache bootstrap/cache storage \
&& chmod -R g+w bootstrap/cache storage

# Install composer dependencies and prepare permissions for Apache
USER monica
RUN docker/install-composer.sh && ./composer.phar install
USER root

# This is the command that the container will run by default
Expand Down
8 changes: 4 additions & 4 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions docker/get-docker-compose.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash
set -evuo pipefail

dockercomposeversion=1.18.0

mkdir -p ~/docker-compose
pushd ~/docker-compose > /dev/null
if [ ! -d "$dockercomposeversion" ]; then
echo "Download docker-compose"
mkdir -p $dockercomposeversion
curl -sSL https://github.com/docker/compose/releases/download/$dockercomposeversion/docker-compose-`uname -s`-`uname -m` > $dockercomposeversion/docker-compose
fi

sudo cp $dockercomposeversion/docker-compose /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose

popd > /dev/null
1 change: 1 addition & 0 deletions public/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mix-manifest.json
2 changes: 2 additions & 0 deletions public/css/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!.gitignore
15 changes: 0 additions & 15 deletions public/css/app.css

This file was deleted.

1 change: 0 additions & 1 deletion public/css/app.css.map

This file was deleted.

2 changes: 0 additions & 2 deletions public/css/stripe.css

This file was deleted.

1 change: 0 additions & 1 deletion public/css/stripe.css.map

This file was deleted.

1 change: 1 addition & 0 deletions public/fonts/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
vendor
Empty file added public/fonts/.gitkeep
Empty file.
Binary file not shown.
Loading