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

Cleaned up documentation for installation process #2403

Merged
merged 20 commits into from Oct 10, 2016

Conversation

nicosomb
Copy link
Member

@nicosomb nicosomb commented Oct 8, 2016

Q A
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Documentation yes
Translation yes
Fixed tickets #2370
License MIT

You can now install wallabag with only 3 commands:

git clone https://github.com/wallabag/wallabag.git
cd wallabag
make install

We won't need to update wallabag for each new release with the new tag.

@nicosomb
Copy link
Member Author

nicosomb commented Oct 8, 2016

It's a quick draft. Today, we have so many pages which tell us how to install wallabag. I wanted to standardize the installation process.

I need to review the update process. But I want your opinion about this first draft.
I need to update wallabag.org website with latest package md5 checksum.

If it's OK, I also need the help of german translators in this PR (ping @jlnostr @Strubbl).

git checkout 2.1.1
SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
php bin/console wallabag:install --env=prod
./install.sh
php bin/console server:run --env=prod
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can remove the indentation here

#! /usr/bin/env bash

TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
git checkout $TAG
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--force? To avoid error if user has changed some files in the repo?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an installation, so no changed files I think

@tcitworld
Copy link
Member

tcitworld commented Oct 9, 2016

Instead of using an install.sh, could we this time use make ?
I could see :

  • make install: like install.sh
  • make update : update an existing installation
  • make build : run grunt
  • make tests : run ant prepare && phpunit
  • make release : produce a wallabag release
  • make travis : make things for travis

@nicosomb
Copy link
Member Author

nicosomb commented Oct 9, 2016

👍 I'll look that tomorrow

@tcitworld
Copy link
Member

I like your vision of tomorrow.

update: ## Update the wallabag installation to the latest version
@sh scripts/update.sh $(ENV)

run: ## Run the wallabag server
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

build-in server

@tcitworld
Copy link
Member

Don't forget to add that make is required now.

@@ -0,0 +1,17 @@
#! /usr/bin/env bash

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe you can put an example on how to launch that command (in comment)?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We launch this command from Makefile. Need to document here too?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still more documentation than none :)

run: ## Run the wallabag server
php bin/console server:run --env=$(ENV)
run: ## Run the wallabag built-in server
@php bin/console server:run --env=$(ENV)

build: ## Run grunt
@grunt

test: ## Launch wallabag testsuite
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe a regular composer installwill be needed to install phpunit ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A composer install before launching testsuite?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, this takes time.
Should be

if vendor/phpunit/ not exists
     composer install
tests

@nicosomb nicosomb modified the milestone: 2.1.2 Oct 10, 2016
git clone git@github.com:wallabag/wallabag.git -b release-2.0.0-beta.1 release-2.0.0-beta.1
SYMFONY_ENV=prod composer up -d=release-2.0.0-beta.1 --no-dev
tar czf wallabag-release-2.0.0-beta.1.tar.gz --exclude="var/*" --exclude=".git" release-2.0.0-beta.1
make releas emaster /tmp wllbg-release prod
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make release master

@@ -6,6 +6,19 @@ Voraussetzungen

wallabag ist kompatibel mit PHP >= 5.5, inkl. PHP 7.

.. note::
Pour installer wallabag facilement, nous avons créé un ``Makefile``, vous avez donc besoin d'avoir installé l'outil ``make``.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is there french here ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know. It's not me. I'm sorry.


.. image:: ../../img/user/android_configuration_connection_test.en.png
:alt: Connection test with your wallabag data
:align: center

The connection test shall finish with success. If not, you need to fix this first until you proceed.
The connection test shall finish with success. If not, you need to fix this first until you proceed.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shall -> should

@@ -65,7 +65,7 @@ After hitting the save button, you get the following screen. The app proposes to
:alt: Settings saved the first time
:align: center

Finally after the syncronisation finished successfully, you are presented the list of unread articles.
Finally after the syncronisation finished successfully, you are presented the list of unread articles.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are presented to

@tcitworld
Copy link
Member

tcitworld commented Oct 10, 2016

Please also add a page to explain the meaning of each parameter in parameters.yml.

#2392

@nicosomb
Copy link
Member Author

@tcitworld 😭

@nicosomb
Copy link
Member Author

I added a draft for parameters explanation.

@j0k3r
Copy link
Member

j0k3r commented Oct 10, 2016

We should update this too:

@j0k3r
Copy link
Member

j0k3r commented Oct 10, 2016

Can we also add some doc about launching test in local? (requested from a user)

@j0k3r
Copy link
Member

j0k3r commented Oct 10, 2016

Awesome :trollface: (missed that commit)

@j0k3r j0k3r merged commit bccf7a7 into master Oct 10, 2016
@j0k3r j0k3r deleted the cleanup-install-process-in-doc branch October 10, 2016 14:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants