Skip to content

Commit 032d7b2

Browse files
authored
Merge pull request #24649 from mani-ramaswamy/master
cifs update
2 parents 39ea47c + 80a2afe commit 032d7b2

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

articles/service-fabric/service-fabric-cicd-your-linux-java-application-with-jenkins.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ cd service-fabric-java-getting-started/Services/JenkinsDocker/
4747
sudo mount -t cifs //sfjenkinsstorage1.file.core.windows.net/sfjenkins [mount point] -o vers=3.0,username=sfjenkinsstorage1,password=<storage_key>,dir_mode=0777,file_mode=0777
4848
```
4949

50+
> [!NOTE]
51+
> To mount cifs shares, you need to have the cifs-utils package installed in the cluster nodes.
52+
>
53+
5054
4. Update the placeholder values in the ```setupentrypoint.sh``` script with corresponding azure-storage details.
5155
```sh
5256
vi JenkinsSF/JenkinsOnSF/Code/setupentrypoint.sh

articles/service-fabric/service-fabric-cli.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ If the installation on Windows subsystem for Linux fails with incorrect folder p
103103
sudo pip3 install sfctl
104104
```
105105

106+
<a name = "cli-mac"></a>
106107
### MacOS
107108

108109
For MacOS, we recommend that you use the [HomeBrew package manager](https://brew.sh). If HomeBrew is not already installed, install it by running the following command:

articles/service-fabric/service-fabric-docker-compose.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ If the service name that you specify in a Compose file is a fully qualified doma
124124

125125
For example, if the specified application name is `fabric:/SampleApp/MyComposeApp`, `<ServiceName>.MyComposeApp.SampleApp` would be the registered DNS name.
126126

127-
## Differences between Compose deployment (instance definition) and Service Fabric application model (type definition)
127+
## Compose deployment (instance definition) versus Service Fabric app model (type definition)
128128

129129
A docker-compose.yml file describes a deployable set of containers, including their properties and configurations.
130130
For example, the file can contain environment variables and ports. You can also specify deployment parameters, such as placement constraints, resource limits, and DNS names, in the docker-compose.yml file.

articles/service-fabric/service-fabric-get-started-mac.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,17 +103,13 @@ To build Service Fabric services using Java, ensure you have JDK 1.8 installed a
103103
sudo apt-get install gradle
104104
```
105105

106-
## Set up the Service Fabric CLI
106+
## Set up the Service Fabric CLI (sfctl) on your Mac
107107

108-
The [Service Fabric CLI](service-fabric-cli.md) has commands for interacting with Service Fabric entities,
109-
including clusters and applications. It is based on python, so be sure to have python and pip installed before you
110-
proceed with the following command:
108+
Follow the instructions at [Service Fabric CLI](service-fabric-cli.md#cli-mac) to install the Service Fabric CLI (`sfctl`) on your Mac.
109+
The CLI commands for interacting with Service Fabric entities, including clusters, applications and services.
111110

112-
```bash
113-
pip install sfctl
114-
```
111+
## Create application on you Mac using Yeoman
115112

116-
## Create application on Mac using Yeoman
117113
Service Fabric provides scaffolding tools which will help you create a Service Fabric application from terminal using Yeoman template generator. Please follow the steps below to ensure you have the Service Fabric yeoman template generator working on your machine.
118114

119115
1. You need to have Node.js and NPM installed on you mac. If not you can install Node.js and NPM using Homebrew using the following. To check the versions of Node.js and NPM installed on your Mac, you can use the ``-v`` option.

0 commit comments

Comments
 (0)